summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
authormbkma <[email protected]>2021-04-13 16:24:25 +0200
committerraveit65 <[email protected]>2021-04-29 22:10:33 +0200
commita1eaebb20fdc2ce0786362c9477baa846d295aeb (patch)
tree28a475092f0f8b2508399c1eb624c186b0274dda /capplets
parent6e0fc53c78d784aef2336a671a516e003f4ba359 (diff)
downloadmate-control-center-a1eaebb20fdc2ce0786362c9477baa846d295aeb.tar.bz2
mate-control-center-a1eaebb20fdc2ce0786362c9477baa846d295aeb.tar.xz
windows-applet: csd windows respect titlebar button layout
Diffstat (limited to 'capplets')
-rw-r--r--capplets/windows/mate-window-properties.c6
-rw-r--r--capplets/windows/window-properties.ui5
2 files changed, 8 insertions, 3 deletions
diff --git a/capplets/windows/mate-window-properties.c b/capplets/windows/mate-window-properties.c
index 501569d0..90b46f9c 100644
--- a/capplets/windows/mate-window-properties.c
+++ b/capplets/windows/mate-window-properties.c
@@ -40,6 +40,9 @@
#include "capplet-util.h"
#define MARCO_SCHEMA "org.mate.Marco.general"
+#define INTERFACE_SCHEMA "org.mate.interface"
+
+#define GTK_BUTTON_LAYOUT_KEY "gtk-decoration-layout"
#define MARCO_CENTER_NEW_WINDOWS_KEY "center-new-windows"
#define MARCO_ALLOW_TILING_KEY "allow-tiling"
@@ -122,6 +125,7 @@ static GtkWidget *titlebar_layout_optionmenu;
static GtkWidget *compositing_checkbutton;
static GSettings *marco_settings;
+static GSettings *interface_settings;
static MouseClickModifier *mouse_modifiers = NULL;
static int n_mouse_modifiers = 0;
@@ -415,6 +419,7 @@ main (int argc, char **argv)
/* Load settings */
marco_settings = g_settings_new (MARCO_SCHEMA);
+ interface_settings = g_settings_new (INTERFACE_SCHEMA);
reload_mouse_modifiers ();
@@ -504,6 +509,7 @@ main (int argc, char **argv)
gtk_main ();
g_object_unref (marco_settings);
+ g_object_unref (interface_settings);
g_free (custom_titlebar_button_layout);
diff --git a/capplets/windows/window-properties.ui b/capplets/windows/window-properties.ui
index 1426188b..22b61f0f 100644
--- a/capplets/windows/window-properties.ui
+++ b/capplets/windows/window-properties.ui
@@ -671,7 +671,6 @@ Author: Robert Buj
<object class="GtkLabel" id="position_of_titlebar_buttons_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="halign">start</property>
<property name="label" translatable="yes">_Position of titlebar buttons:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">titlebar_layout_optionmenu</property>
@@ -710,14 +709,14 @@ Author: Robert Buj
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>