diff --git a/doc/dbus.rst b/doc/dbus.rst index de1deb5b..00494f19 100644 --- a/doc/dbus.rst +++ b/doc/dbus.rst @@ -350,14 +350,14 @@ org.freedesktop.ratbag1.Resolution This list may be empty if the device does not support reading and/or writing to resolutions. -.. function:: SetDefault() → () - - Set this resolution to be the default - .. function:: SetActive() → () Set this resolution to be the active one +.. function:: SetDefault() → () + + Set this resolution to be the default + .. _button: org.freedesktop.ratbag1.Button diff --git a/ratbagd/ratbagd-resolution.c b/ratbagd/ratbagd-resolution.c index 114a08a7..d6c75952 100644 --- a/ratbagd/ratbagd-resolution.c +++ b/ratbagd/ratbagd-resolution.c @@ -51,10 +51,10 @@ int ratbagd_resolution_resync(sd_bus *bus, return sd_bus_emit_properties_changed(bus, resolution->path, RATBAGD_NAME_ROOT ".Resolution", - "IsDefault", "Resolution", "ReportRate", "IsActive", + "IsDefault", NULL); } diff --git a/tools/ratbagc.py.in b/tools/ratbagc.py.in index 8130e254..c47fea89 100644 --- a/tools/ratbagc.py.in +++ b/tools/ratbagc.py.in @@ -482,14 +482,14 @@ class RatbagdResolution(metaclass=MetaRatbag): otherwise""" return libratbag.ratbag_resolution_is_default(self._res) - def set_default(self): - """Set this resolution to be the default.""" - return libratbag.ratbag_resolution_set_default(self._res) - def set_active(self): """Set this resolution to be the active one.""" return libratbag.ratbag_resolution_set_active(self._res) + def set_default(self): + """Set this resolution to be the default.""" + return libratbag.ratbag_resolution_set_default(self._res) + class RatbagdButton(metaclass=MetaRatbag): """Represents a ratbagd button.""" diff --git a/tools/ratbagctl.test.in b/tools/ratbagctl.test.in index fd03e940..3313f68b 100755 --- a/tools/ratbagctl.test.in +++ b/tools/ratbagctl.test.in @@ -304,6 +304,17 @@ class TestRatbagCtlResolution(TestRatbagCtl): def setUpClass(cls): super().setUpClass() + def test_resolution_n_get(self): + r = self.launch_good_test("test_device resolution 1 get") + self.assertEqual(r, "1: 1200x1300dpi (default)") + self.launch_fail_test("test_device resolution 10 get") + self.launch_fail_test("test_device resolution 1 get X") + self.launch_fail_test("resolution 1 get X") + + def test_profile_resolution(self): + r = self.launch_good_test("test_device profile 2 resolution 1 get") + self.assertEqual(r, "1: 1200x1300dpi") + def test_resolution_active_get(self): command = "resolution active get" r = self.launch_good_test("test_device " + command) @@ -323,17 +334,6 @@ class TestRatbagCtlResolution(TestRatbagCtl): self.launch_fail_test("test_device " + command + " X") self.launch_fail_test("test_device " + command + " 1 X") - def test_resolution_n_get(self): - r = self.launch_good_test("test_device resolution 1 get") - self.assertEqual(r, "1: 1200x1300dpi (default)") - self.launch_fail_test("test_device resolution 10 get") - self.launch_fail_test("test_device resolution 1 get X") - self.launch_fail_test("resolution 1 get X") - - def test_profile_resolution(self): - r = self.launch_good_test("test_device profile 2 resolution 1 get") - self.assertEqual(r, "1: 1200x1300dpi") - def test_resolution_default_get(self): command = "resolution default get" r = self.launch_good_test("test_device " + command) diff --git a/tools/ratbagd.py b/tools/ratbagd.py index 3778bc90..b62966c1 100644 --- a/tools/ratbagd.py +++ b/tools/ratbagd.py @@ -605,18 +605,18 @@ class RatbagdResolution(_RatbagdDBus): otherwise""" return self._default - def set_default(self): - """Set this resolution to be the default.""" - ret = self._dbus_call("SetDefault", "") - self._set_dbus_property("IsDefault", "b", True, readwrite=False) - return ret - def set_active(self): """Set this resolution to be the active one.""" ret = self._dbus_call("SetActive", "") self._set_dbus_property("IsActive", "b", True, readwrite=False) return ret + def set_default(self): + """Set this resolution to be the default.""" + ret = self._dbus_call("SetDefault", "") + self._set_dbus_property("IsDefault", "b", True, readwrite=False) + return ret + class RatbagdButton(_RatbagdDBus): """Represents a ratbagd button."""