summaryrefslogtreecommitdiff
path: root/gdk/gdkinternals.h
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-04-18 22:48:02 -0400
committerMatthias Clasen <mclasen@redhat.com>2020-04-19 10:42:10 -0400
commit70fed08e8fd0c79788745207e5bd501cbf849133 (patch)
treec9926953d052b519ab6b5a27a0bc8ba624a54cd4 /gdk/gdkinternals.h
parent3c987f073e4fb4c9fffb96118724f3c0d2d2e782 (diff)
downloadgtk+-70fed08e8fd0c79788745207e5bd501cbf849133.tar.gz
Remove GdkGeometry from public API
The api to configure surfaces is now GdkToplevelLayout and GdkPopupLayout. Unfortunately, there's still quite a bit of internal use of GdkGeometry that will take some time to clean up, so move it go gdkinternals.h for now.
Diffstat (limited to 'gdk/gdkinternals.h')
-rw-r--r--gdk/gdkinternals.h40
1 files changed, 15 insertions, 25 deletions
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 0db0f633a5..5357bd6b1b 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -301,31 +301,6 @@ void gdk_surface_get_geometry (GdkSurface *surface,
GdkGLContext *gdk_surface_get_shared_data_gl_context (GdkSurface *surface);
-/* Size restriction enumeration.
- */
-/**
- * GdkSurfaceHints:
- * @GDK_HINT_POS: indicates that the program has positioned the surface
- * @GDK_HINT_MIN_SIZE: min size fields are set
- * @GDK_HINT_MAX_SIZE: max size fields are set
- * @GDK_HINT_BASE_SIZE: base size fields are set
- * @GDK_HINT_ASPECT: aspect ratio fields are set
- * @GDK_HINT_RESIZE_INC: resize increment fields are set
- * @GDK_HINT_WIN_GRAVITY: surface gravity field is set
- * @GDK_HINT_USER_POS: indicates that the surface’s position was explicitly set
- * by the user
- * @GDK_HINT_USER_SIZE: indicates that the surface’s size was explicitly set by
- * the user
- *
- * Used to indicate which fields of a #GdkGeometry struct should be paid
- * attention to. Also, the presence/absence of @GDK_HINT_POS,
- * @GDK_HINT_USER_POS, and @GDK_HINT_USER_SIZE is significant, though they don't
- * directly refer to #GdkGeometry fields. @GDK_HINT_USER_POS will be set
- * automatically by #GtkWindow if you call gtk_window_move().
- * @GDK_HINT_USER_POS and @GDK_HINT_USER_SIZE should be set if the user
- * specified a size/position using a --geometry command-line argument;
- * gtk_window_parse_geometry() automatically sets these flags.
- */
typedef enum
{
GDK_HINT_POS = 1 << 0,
@@ -339,6 +314,21 @@ typedef enum
GDK_HINT_USER_SIZE = 1 << 8
} GdkSurfaceHints;
+struct _GdkGeometry
+{
+ gint min_width;
+ gint min_height;
+ gint max_width;
+ gint max_height;
+ gint base_width;
+ gint base_height;
+ gint width_inc;
+ gint height_inc;
+ gdouble min_aspect;
+ gdouble max_aspect;
+ GdkGravity win_gravity;
+};
+
GDK_AVAILABLE_IN_ALL
void gdk_surface_constrain_size (GdkGeometry *geometry,
GdkSurfaceHints flags,