Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RDNN behavior schema #2034

Merged
merged 1 commit into from
Aug 19, 2024
Merged

RDNN behavior schema #2034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions data/gala.gschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</key>
</schema>

<schema path="/org/pantheon/desktop/gala/behavior/" id="org.pantheon.desktop.gala.behavior">
<schema path="/io/elementary/desktop/wm/behavior/" id="io.elementary.desktop.wm.behavior">
<key enum="GalaActionType" name="hotcorner-topleft">
<default>"none"</default>
<summary>Action for the top left corner</summary>
Expand Down Expand Up @@ -86,9 +86,6 @@
<summary>Automatically move fullscreened windows to a new workspace</summary>
<description></description>
</key>
</schema>

<schema path="/io/elementary/desktop/wm/behavior/" id="io.elementary.desktop.wm.behavior">
<key type="b" name="enable-hotcorners-in-fullscreen">
<default>false</default>
<summary>Whether hotcorners should be enabled when fullscreen window is opened</summary>
Expand Down
1 change: 0 additions & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ conf.set_quoted('PKGDATADIR', pkgdata_dir)
conf.set_quoted('PLUGINDIR', plugins_dir)
conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala')
conf.set_quoted('VERSION', gala_version)
conf.set_quoted('SCHEMA', 'org.pantheon.desktop.gala')
config_h = configure_file(
output: 'config.h',
configuration: conf
Expand Down
2 changes: 1 addition & 1 deletion src/InternalUtils.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace Gala {
rects = {rect};
break;
case InputArea.DEFAULT:
var settings = new GLib.Settings (Config.SCHEMA + ".behavior");
var settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");

// if ActionType is NONE make it 0 sized
ushort tl_size = (settings.get_enum ("hotcorner-topleft") != ActionType.NONE ? 1 : 0);
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/MultitaskingView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ namespace Gala {
}

construct {
gala_behavior_settings = new GLib.Settings ("org.pantheon.desktop.gala.behavior");
gala_behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
style_manager = Drawing.StyleManager.get_instance ();

visible = false;
Expand Down
2 changes: 1 addition & 1 deletion src/WindowManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ namespace Gala {

animations_settings = new GLib.Settings ("io.elementary.desktop.wm.animations");
animations_settings.bind ("enable-animations", this, "enable-animations", GLib.SettingsBindFlags.GET);
behavior_settings = new GLib.Settings (Config.SCHEMA + ".behavior");
behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
new_behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
enable_animations = animations_settings.get_boolean ("enable-animations");

Expand Down
1 change: 0 additions & 1 deletion vapi/config.vapi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ namespace Config
public const string PKGDATADIR;
public const string VERSION;
public const string PLUGINDIR;
public const string SCHEMA;
public const string RESOURCEPATH;
}
Loading