Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync to home

Browse Source
This commit is contained in:
Havoc Pennington
2000-07-09 04:15:30 +00:00
parent 7d952d8f1c
commit 2331f8409b
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkenums.h
View File

@@ -313,7 +313,8 @@ typedef enum
GTK_WIN_POS_NONE,
GTK_WIN_POS_CENTER,
GTK_WIN_POS_MOUSE,
GTK_WIN_POS_CENTER_ALWAYS
GTK_WIN_POS_CENTER_ALWAYS,
GTK_WIN_POS_CENTER_ON_PARENT
} GtkWindowPosition;
/* Window types */

26
gtk/gtkwindow.c
View File

@@ -2137,13 +2137,20 @@ gtk_window_compute_reposition (GtkWindow *window,
gint *y)
{
GtkWidget *widget;
GtkWindowPosition pos;
widget = GTK_WIDGET (window);
*x = -1;
*y = -1;
pos = window->position;
if (pos == GTK_WIN_POS_CENTER_ON_PARENT &&
(window->transient_parent == NULL ||
!GTK_WIDGET_MAPPED (window->transient_parent))
pos = GTK_WIN_POS_NONE;
switch (window->position)
switch (pos)
{
case GTK_WIN_POS_CENTER:
case GTK_WIN_POS_CENTER_ALWAYS:
@@ -2156,6 +2163,21 @@ gtk_window_compute_reposition (GtkWindow *window,
*y = (screen_height - new_height) / 2;
}
break;
case GTK_WIN_POS_CENTER_ON_PARENT:
if (window->use_uposition)
{
gint ox, oy;
gdk_window_get_origin (window->transient_parent->window,
&ox, &oy);
g_assert (window->transient_parent);
*x = ox + (window->transient_parent->allocation.width - new_width) / 2;
*y = oy + (window->transient_parent->allocation.height - new_height) / 2;
}
break;
case GTK_WIN_POS_MOUSE:
if (window->use_uposition)
{