[epiphany/wip/exalm/window-move] window: Stop setting position




commit 478857a672a74aeda2bb08f4906fdaac4ced9790
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Mar 17 14:38:15 2022 +0400

    window: Stop setting position
    
    This never worked on Wayland and will go away in GTK4.

 src/ephy-session.c |  3 ---
 src/ephy-window.c  | 30 ------------------------------
 src/ephy-window.h  |  3 ---
 3 files changed, 36 deletions(-)
---
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 5aa5609da..e399826cb 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -1090,9 +1090,6 @@ static void
 restore_geometry (GtkWindow    *window,
                   GdkRectangle *geometry)
 {
-  if (geometry->x >= 0 && geometry->y >= 0)
-    ephy_window_set_default_position (EPHY_WINDOW (window), geometry->x, geometry->y);
-
   if (geometry->width > 0 && geometry->height > 0)
     ephy_window_set_default_size (EPHY_WINDOW (window), geometry->width, geometry->height);
 }
diff --git a/src/ephy-window.c b/src/ephy-window.c
index fef509336..baaa19614 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -185,7 +185,6 @@ struct _EphyWindow {
   gint current_y;
 
   guint has_default_size : 1;
-  guint has_default_position : 1;
   guint is_maximized : 1;
   guint is_fullscreen : 1;
   guint closing : 1;
@@ -1892,8 +1891,6 @@ window_properties_geometry_changed (WebKitWindowProperties *properties,
   GdkRectangle geometry;
 
   webkit_window_properties_get_geometry (properties, &geometry);
-  if (geometry.x >= 0 && geometry.y >= 0)
-    gtk_window_move (GTK_WINDOW (window), geometry.x, geometry.y);
 
   if (geometry.width > 0 && geometry.height > 0)
     gtk_window_resize (GTK_WINDOW (window), geometry.width, geometry.height);
@@ -3202,15 +3199,6 @@ ephy_window_set_default_size (EphyWindow *window,
   window->has_default_size = TRUE;
 }
 
-void
-ephy_window_set_default_position (EphyWindow *window,
-                                  gint        x,
-                                  gint        y)
-{
-  gtk_window_move (GTK_WINDOW (window), x, y);
-  window->has_default_position = TRUE;
-}
-
 static void
 ephy_window_show (GtkWidget *widget)
 {
@@ -3225,20 +3213,6 @@ ephy_window_show (GtkWidget *widget)
   if (window->is_maximized)
     gtk_window_maximize (GTK_WINDOW (window));
   else {
-    if (!window->has_default_position) {
-      g_settings_get (EPHY_SETTINGS_STATE,
-                      "window-position", "(ii)",
-                      &window->current_x,
-                      &window->current_y);
-      if (window->current_x >= 0 && window->current_y >= 0) {
-        gtk_window_move (GTK_WINDOW (window),
-                         window->current_x,
-                         window->current_y);
-      }
-
-      window->has_default_position = TRUE;
-    }
-
     if (!window->has_default_size) {
       g_settings_get (EPHY_SETTINGS_STATE,
                       "window-size", "(ii)",
@@ -3282,10 +3256,6 @@ ephy_window_destroy (GtkWidget *widget)
                     "window-size", "(ii)",
                     window->current_width,
                     window->current_height);
-    g_settings_set (EPHY_SETTINGS_STATE,
-                    "window-position", "(ii)",
-                    window->current_x,
-                    window->current_y);
     g_settings_set_boolean (EPHY_SETTINGS_STATE, "is-maximized", window->is_maximized);
   }
 
diff --git a/src/ephy-window.h b/src/ephy-window.h
index ec2f2a2de..c34b0d474 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -80,9 +80,6 @@ void              ephy_window_set_location             (EphyWindow *window,
 void              ephy_window_set_default_size         (EphyWindow *window,
                                                         gint        width,
                                                         gint        height);
-void              ephy_window_set_default_position     (EphyWindow *window,
-                                                        gint        x,
-                                                        gint        y);
 void              ephy_window_show_fullscreen_header_bar (EphyWindow *window);
 
 void              ephy_window_update_entry_focus         (EphyWindow  *window,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]