1 files changed, 9 insertions, 17 deletions

diff --git a/src/caja-window.c b/src/caja-window.c
index a180414c..2191a7ed 100644
--- a/src/caja-window.c
+++ b/src/caja-window.c
@@ -591,8 +591,7 @@ caja_window_zoom_to_default (CajaWindow *window)
 static guint
 get_max_forced_height (GdkScreen *screen)
 {
-    gint scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen));
-    return (HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale * 90) / 100;
+    return (gdk_screen_get_height (screen) * 90) / 100;
 }
 
 /* Code should never force the window wider than this size.
@@ -601,8 +600,7 @@ get_max_forced_height (GdkScreen *screen)
 static guint
 get_max_forced_width (GdkScreen *screen)
 {
-    gint scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen));
-    return (WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale * 90) / 100;
+    return (gdk_screen_get_width (screen) * 90) / 100;
 }
 
 /* This must be called when construction of CajaWindow is finished,
@@ -634,17 +632,6 @@ caja_window_set_initial_window_geometry (CajaWindow *window)
 }
 
 static void
-caja_window_constructed (GObject *self)
-{
-    CajaWindow *window;
-
-    window = CAJA_WINDOW (self);
-
-    caja_window_initialize_bookmarks_menu (window);
-    caja_window_set_initial_window_geometry (window);
-}
-
-static void
 caja_window_set_property (GObject *object,
                           guint arg_id,
                           const GValue *value,
@@ -744,6 +731,12 @@ caja_window_constructor (GType type,
 
     slot = caja_window_open_slot (window->details->active_pane, 0);
     caja_window_set_active_slot (window, slot);
+    /*We can now do this here instead of in a separate constructed function
+     *and we need to because the separate constructed function causes the
+     *window to be un-draggable/un-resizable with the mouse in wayland
+     */
+    caja_window_initialize_bookmarks_menu (window);
+    caja_window_set_initial_window_geometry (window);
 
     return object;
 }
@@ -1073,7 +1066,7 @@ caja_window_key_press_event (GtkWidget *widget,
         return TRUE;
 
     CajaWindow *window;
-    int i;
+    gsize i;
 
     window = CAJA_WINDOW (widget);
 
@@ -2172,7 +2165,6 @@ caja_window_class_init (CajaWindowClass *class)
     GtkBindingSet *binding_set;
 
     G_OBJECT_CLASS (class)->constructor = caja_window_constructor;
-    G_OBJECT_CLASS (class)->constructed = caja_window_constructed;
     G_OBJECT_CLASS (class)->get_property = caja_window_get_property;
     G_OBJECT_CLASS (class)->set_property = caja_window_set_property;
     G_OBJECT_CLASS (class)->finalize = caja_window_finalize;