applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't allow dragging when there is only one connected monitor.

Browse source 
Tue Jul 15 18:48:43 2008  S%G�%@ren Sandmann  <sandmann@redhat.com>

	* xrandr-capplet.c: Don't allow dragging when there is only one
	connected monitor.


svn path=/trunk/; revision=8784
This commit is contained in:
S%G�%@ren Sandmann 2008-07-15 22:51:02 +00:00 • committed by Søren Sandmann Pedersen
parent 8ae8397e50
commit 8d42670499
2 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/display/ChangeLog
View file

@ -1,3 +1,8 @@
Tue Jul 15 18:48:43 2008 Søren Sandmann <sandmann@redhat.com>
* xrandr-capplet.c: Don't allow dragging when there is only one
connected monitor.
Thu Jul 10 14:46:37 2008 Søren Sandmann <sandmann@redhat.com> Thu Jul 10 14:46:37 2008 Søren Sandmann <sandmann@redhat.com>
* main.c: Remove this obsolete file. * main.c: Remove this obsolete file.

34
capplets/display/xrandr-capplet.c
View file

@ -790,14 +790,25 @@ list_connected_outputs (App *app, int *total_w, int *total_h)
return g_list_reverse (result); return g_list_reverse (result);
} }
static int
get_n_connected (App *app)
{
GList *connected_outputs = list_connected_outputs (app, NULL, NULL);
int n = g_list_length (connected_outputs);
g_list_free (connected_outputs);
return n;
}
static double static double
compute_scale (App *app) compute_scale (App *app)
{ {
GList *connected_outputs;
int available_w, available_h; int available_w, available_h;
int total_w, total_h; int total_w, total_h;
int n_monitors; int n_monitors;
GdkRectangle viewport; GdkRectangle viewport;
GList *connected_outputs;
foo_scroll_area_get_viewport (FOO_SCROLL_AREA (app->area), &viewport); foo_scroll_area_get_viewport (FOO_SCROLL_AREA (app->area), &viewport);
@ -805,6 +816,8 @@ compute_scale (App *app)
n_monitors = g_list_length (connected_outputs); n_monitors = g_list_length (connected_outputs);
g_list_free (connected_outputs);
available_w = viewport.width - 2 * MARGIN - (n_monitors - 1) * SPACE; available_w = viewport.width - 2 * MARGIN - (n_monitors - 1) * SPACE;
available_h = viewport.height - 2 * MARGIN - (n_monitors - 1) * SPACE; available_h = viewport.height - 2 * MARGIN - (n_monitors - 1) * SPACE;
@ -1128,7 +1141,7 @@ compare_snaps (gconstpointer v1, gconstpointer v2)
d = sv1 - sv2; d = sv1 - sv2;
/* This snapping algorithm is good for rock'n'roll, but /* This snapping algorithm is good enough for rock'n'roll, but
* this is probably a better: * this is probably a better:
* *
* First do a horizontal/vertical snap, then * First do a horizontal/vertical snap, then
@ -1170,15 +1183,18 @@ on_output_event (FooScrollArea *area,
rebuild_gui (app); rebuild_gui (app);
foo_scroll_area_begin_grab (area, on_output_event, data); if (!app->current_configuration->clone && get_n_connected (app) > 1)
{
foo_scroll_area_begin_grab (area, on_output_event, data);
info = g_new0 (GrabInfo, 1); info = g_new0 (GrabInfo, 1);
info->grab_x = event->x; info->grab_x = event->x;
info->grab_y = event->y; info->grab_y = event->y;
info->output_x = output->x; info->output_x = output->x;
info->output_y = output->y; info->output_y = output->y;
output->user_data = info; output->user_data = info;
}
foo_scroll_area_invalidate (area); foo_scroll_area_invalidate (area);
} }