graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-21 20:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

New helper function. Same functionality as

Browse source 
2006-04-20  Tor Lillqvist  <tml@novell.com>

	* app/widgets/gimpsessioninfo.c (get_appropriate_monitor): New
	helper function. Same functionality as
	gdk_screen_get_monitor_at_window(), except that it takes a window
	geometry as parameter and not the window itself.
	(gimp_session_info_set_geometry): Make sure the window is
	completely inside a monitor. (#339099, #324254)
This commit is contained in:
Tor Lillqvist 2006-04-20 18:41:38 +00:00 committed by Tor Lillqvist
parent 1436eb92a0
commit 94d8a4131b
2 changed files with 72 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2006-04-20 Tor Lillqvist <tml@novell.com>
* app/widgets/gimpsessioninfo.c (get_appropriate_monitor): New
helper function. Same functionality as
gdk_screen_get_monitor_at_window(), except that it takes a window
geometry as parameter and not the window itself.
(gimp_session_info_set_geometry): Make sure the window is
completely inside a monitor. (#339099, #324254)
2006-04-20 Simon Budig <simon@gimp.org>
* plug-ins/common/convmatrix.c: only access existing toggle buttons.

71
app/widgets/gimpsessioninfo.c
View file

@ -828,24 +828,79 @@ gimp_session_info_restore (GimpSessionInfo *info,
info->aux_info = NULL;
}
/* This function mostly lifted from
* gtk+/gdk/gdkscreen.c:gdk_screen_get_monitor_at_window()
*/
static gint
get_appropriate_monitor (GdkScreen *screen,
gint x,
gint y,
gint w,
gint h)
{
gint num_monitors, i, area = 0, monitor = -1;
GdkRectangle rect;
rect.x = x;
rect.y = y;
rect.width = w;
rect.height = h;
num_monitors = gdk_screen_get_n_monitors (screen);
for (i = 0; i < num_monitors; i++)
{
GdkRectangle tmp_monitor, intersect;
gdk_screen_get_monitor_geometry (screen, i, &tmp_monitor);
gdk_rectangle_intersect (&rect, &tmp_monitor, &intersect);
if (intersect.width * intersect.height > area)
{
area = intersect.width * intersect.height;
monitor = i;
}
}
if (monitor >= 0)
return monitor;
else
return gdk_screen_get_monitor_at_point (screen,
rect.x + rect.width / 2,
rect.y + rect.height / 2);
}
void
gimp_session_info_set_geometry (GimpSessionInfo *info)
{
GdkScreen *screen;
gint screen_width;
gint screen_height;
gchar geom[32];
GdkScreen *screen;
GdkRectangle monitor;
gchar geom[32];
g_return_if_fail (info != NULL);
g_return_if_fail (GTK_IS_WINDOW (info->widget));
screen = gtk_widget_get_screen (info->widget);
screen_width = gdk_screen_get_width (screen);
screen_height = gdk_screen_get_height (screen);
if ((!info->toplevel_entry || info->toplevel_entry->remember_size) &&
info->width > 0 && info->height > 0)
{
gdk_screen_get_monitor_geometry (screen,
get_appropriate_monitor (screen,
info->x, info->y,
info->width, info->height),
&monitor);
info->x = CLAMP (info->x, monitor.x, monitor.x + monitor.width - info->width);
info->y = CLAMP (info->y, monitor.y, monitor.y + monitor.height - info->height);
}
else
{
gdk_screen_get_monitor_geometry (screen,
gdk_screen_get_monitor_at_point (screen, info->x, info->y),
&monitor);
info->x = CLAMP (info->x, 0, screen_width - 128);
info->y = CLAMP (info->y, 0, screen_height - 128);
info->x = CLAMP (info->x, monitor.x, monitor.x + monitor.width - 128);
info->y = CLAMP (info->y, monitor.y, monitor.y + monitor.height - 128);
}
g_snprintf (geom, sizeof (geom), "+%d+%d", info->x, info->y);