diff options
author | Benjamin Otte <otte@redhat.com> | 2020-07-30 17:05:23 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2020-07-30 17:06:15 +0200 |
commit | 13d3afa56e9ee27e64a6ebb2a69c6ac6aba63371 (patch) | |
tree | 2f860ff9ab7f6dcb095224ced414549ebe27d4e6 | |
parent | 3dd0e6d0b1d471481797a6bbd59a42b8ed873639 (diff) | |
download | gtk+-13d3afa56e9ee27e64a6ebb2a69c6ac6aba63371.tar.gz |
Remove unused GDK_HINT_POS
-rw-r--r-- | gdk/gdkinternals.h | 1 | ||||
-rw-r--r-- | gdk/macos/gdkmacossurface.c | 2 | ||||
-rw-r--r-- | gdk/win32/gdksurface-win32.c | 10 | ||||
-rw-r--r-- | gdk/x11/gdksurface-x11.c | 17 | ||||
-rw-r--r-- | gtk/gtkwindow.c | 17 |
5 files changed, 9 insertions, 38 deletions
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index 8a51704b41..3b5776cbb5 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -296,7 +296,6 @@ GdkGLContext *gdk_surface_get_shared_data_gl_context (GdkSurface *surface); typedef enum { - GDK_HINT_POS = 1 << 0, GDK_HINT_MIN_SIZE = 1 << 1, GDK_HINT_MAX_SIZE = 1 << 2, } GdkSurfaceHints; diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c index 11cd12d6c3..5f719bb923 100644 --- a/gdk/macos/gdkmacossurface.c +++ b/gdk/macos/gdkmacossurface.c @@ -623,8 +623,6 @@ _gdk_macos_surface_set_geometry_hints (GdkMacosSurface *self, g_return_if_fail (geometry != NULL); g_return_if_fail (self->window != NULL); - if (geom_mask & GDK_HINT_POS) { /* TODO */ } - if (geom_mask & GDK_HINT_MAX_SIZE) max_size = NSMakeSize (geometry->max_width, geometry->max_height); else diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c index 74001bf549..a2d69a3b21 100644 --- a/gdk/win32/gdksurface-win32.c +++ b/gdk/win32/gdksurface-win32.c @@ -832,8 +832,6 @@ show_window_internal (GdkSurface *window, /* For initial map of "normal" windows we want to emulate WM window * positioning behaviour, which means: - * + Use user specified position if GDK_HINT_POS or GDK_HINT_USER_POS - * otherwise: * + default to the initial CW_USEDEFAULT placement, * no matter if the user moved the window before showing it. * + Certain window types and hints have more elaborate positioning @@ -841,8 +839,7 @@ show_window_internal (GdkSurface *window, */ surface = GDK_WIN32_SURFACE (window); if (!already_mapped && - GDK_IS_TOPLEVEL (window) && - (surface->hint_flags & (GDK_HINT_POS | GDK_HINT_USER_POS)) == 0) + GDK_IS_TOPLEVEL (window)) { gboolean center = FALSE; RECT window_rect, center_on_rect; @@ -1419,11 +1416,6 @@ gdk_win32_surface_set_geometry_hints (GdkSurface *window, impl->hint_flags = geom_mask; impl->hints = *geometry; - if (geom_mask & GDK_HINT_POS) - { - /* even the X11 mplementation doesn't care */ - } - if (geom_mask & GDK_HINT_MIN_SIZE) { GDK_NOTE (MISC, g_print ("... MIN_SIZE: %dx%d\n", diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c index 6da5fdb588..f55ab5fc9a 100644 --- a/gdk/x11/gdksurface-x11.c +++ b/gdk/x11/gdksurface-x11.c @@ -2150,16 +2150,13 @@ gdk_x11_surface_set_geometry_hints (GdkSurface *surface, size_hints.flags = 0; - if (geom_mask & GDK_HINT_POS) - { - size_hints.flags |= PPosition; - /* We need to initialize the following obsolete fields because KWM - * apparently uses these fields if they are non-zero. - * #@#!#!$!. - */ - size_hints.x = 0; - size_hints.y = 0; - } + size_hints.flags |= PPosition; + /* We need to initialize the following obsolete fields because KWM + * apparently uses these fields if they are non-zero. + * #@#!#!$!. + */ + size_hints.x = 0; + size_hints.y = 0; if (geom_mask & GDK_HINT_MIN_SIZE) { diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 8020abe08c..fc9723431e 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -5452,17 +5452,6 @@ gtk_window_move_resize (GtkWindow *window) * this. */ - /* Also, if the initial position was explicitly set, then we always - * toggle on PPosition. This makes gtk_window_move(window, 0, 0) - * work. - */ - - if (configure_request_pos_changed) - { - new_flags |= GDK_HINT_POS; - hints_changed = TRUE; - } - current_width = gdk_surface_get_width (priv->surface); current_height = gdk_surface_get_height (priv->surface); @@ -5542,7 +5531,7 @@ gtk_window_move_resize (GtkWindow *window) return; /* Bail out, we didn't really process the move/resize */ } - else if ((configure_request_size_changed || hints_changed) && + else if ((configure_request_size_changed || hints_changed || configure_request_pos_changed) && (current_width != new_request.width || current_height != new_request.height)) { /* We are in one of the following situations: @@ -5725,10 +5714,6 @@ gtk_window_compute_hints (GtkWindow *window, else gtk_window_guess_default_size (window, &requisition.width, &requisition.height); - /* We don't want to set GDK_HINT_POS in here, we just set it - * in gtk_window_move_resize() when we want the position - * honored. - */ *new_flags = 0; get_shadow_width (window, &shadow); |