Skip to content

Shift centered windows considering dock and wingpanel heights #2924

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

Open
vjr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Shift centered windows considering dock and wingpanel heights #2924

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
22 changes: 22 additions & 0 deletions src/Misc/WindowStateSaver.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,29 @@ public class Gala.WindowStateSaver : GLib.Object {
private static GLib.HashTable<string, GLib.Array<Meta.Window?>> app_windows;
private static LoginManager? login_manager;
private static Sqlite.Database db;
private static int dock_height;
private static int wingpanel_height;
private static Settings dock_settings;
private static Settings wingpanel_settings;

public static void init (WindowTracker window_tracker) {
WindowStateSaver.window_tracker = window_tracker;
app_windows = new GLib.HashTable<string, GLib.Array<Meta.Window?>> (GLib.str_hash, GLib.str_equal);

connect_to_logind.begin ();

dock_settings = new Settings ("io.elementary.dock");
dock_height = dock_settings.get_int ("height");
dock_settings.changed["height"].connect (() => {
dock_height = dock_settings.get_int ("height");
});

wingpanel_settings = new Settings ("io.elementary.desktop.wingpanel");
wingpanel_height = wingpanel_settings.get_int ("height");
wingpanel_settings.changed["height"].connect (() => {
wingpanel_height = wingpanel_settings.get_int ("height");
});

var dir = Path.build_filename (GLib.Environment.get_user_data_dir (), "io.elementary.gala");
Posix.mkdir (dir, 0775);
var path = Path.build_filename (dir, "windowstate.db");
Expand Down Expand Up @@ -142,6 +158,12 @@ public class Gala.WindowStateSaver : GLib.Object {

var frame_rect = window.get_frame_rect ();

frame_rect.y += (wingpanel_height - dock_height) / 2;

if (validate_last_window_position (window.display, { frame_rect.x, frame_rect.y, frame_rect.width, frame_rect.height })) {
window.move_resize_frame (true, frame_rect.x, frame_rect.y, frame_rect.width, frame_rect.height);
}

const string INSERT_QUERY = "INSERT INTO apps (app_id, window_index, last_x, last_y, last_width, last_height) VALUES ($app_id, $window_index, $last_x, $last_y, $last_width, $last_height);";
rc = db.prepare_v2 (INSERT_QUERY, INSERT_QUERY.length, out stmt);
if (rc != Sqlite.OK) {
Expand Down