Skip to content

WindowManager: remove duplicate behavior settings #2589

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

Merged
merged 2 commits into from
Oct 23, 2025
Merged

WindowManager: remove duplicate behavior settings #2589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fb091c
WindowManager: remove duplicate behavior settings
lenemter Oct 22, 2025
68dadad
Merge branch 'main' into lenemter/remove-duplicate-behavior-settings
lenemter Oct 23, 2025
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
9 changes: 4 additions & 5 deletions src/HotCorners/HotCornerManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021 elementary, Inc (https://elementary.io)
* Copyright 2021-2025 elementary, Inc (https://elementary.io)
* 2021 José Expósito <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
Expand All @@ -21,12 +21,11 @@ public class Gala.HotCornerManager : Object {

public WindowManager wm { get; construct; }
public GLib.Settings behavior_settings { get; construct; }
public GLib.Settings new_behavior_settings { get; construct; }

private GLib.GenericArray<HotCorner> hot_corners;

public HotCornerManager (WindowManager wm, GLib.Settings behavior_settings, GLib.Settings new_behavior_settings) {
Object (wm: wm, behavior_settings: behavior_settings, new_behavior_settings: new_behavior_settings);
public HotCornerManager (WindowManager wm, GLib.Settings behavior_settings) {
Object (wm: wm, behavior_settings: behavior_settings);

hot_corners = new GLib.GenericArray<HotCorner> ();
behavior_settings.changed.connect (configure);
Expand Down Expand Up @@ -74,7 +73,7 @@ public class Gala.HotCornerManager : Object {
hot_corner.trigger.connect (() => {
if (
display.get_monitor_in_fullscreen (display.get_primary_monitor ()) &&
!new_behavior_settings.get_boolean ("enable-hotcorners-in-fullscreen")
!behavior_settings.get_boolean ("enable-hotcorners-in-fullscreen")
) {
return;
}
Expand Down
4 changes: 1 addition & 3 deletions src/WindowManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ namespace Gala {
private Clutter.Actor? latest_window_snapshot;

private GLib.Settings behavior_settings;
private GLib.Settings new_behavior_settings;

construct {
#if !HAS_MUTTER48
Expand All @@ -119,7 +118,6 @@ namespace Gala {
#endif

behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
new_behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");

//Make it start watching the settings daemon bus
Drawing.StyleManager.get_instance ();
Expand Down Expand Up @@ -368,7 +366,7 @@ namespace Gala {
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (update_ui_group_size);

hot_corner_manager = new HotCornerManager (this, behavior_settings, new_behavior_settings);
hot_corner_manager = new HotCornerManager (this, behavior_settings);
hot_corner_manager.on_configured.connect (update_input_area);
hot_corner_manager.configure ();

Expand Down