gnome-control-center r9166 - trunk/capplets/display

[federico svn gnome org]

Author: federico
Date: Fri Dec 12 23:37:28 2008
New Revision: 9166
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9166&view=rev

Log:
Un-overlap the monitors when turning off mirrored screens

Signed-off-by: Federico Mena Quintero <federico novell com>

Modified:
   trunk/capplets/display/ChangeLog
   trunk/capplets/display/xrandr-capplet.c

Modified: trunk/capplets/display/xrandr-capplet.c
==============================================================================
--- trunk/capplets/display/xrandr-capplet.c	(original)
+++ trunk/capplets/display/xrandr-capplet.c	Fri Dec 12 23:37:28 2008
@@ -62,6 +62,7 @@
 
 static void rebuild_gui (App *app);
 static void on_rate_changed (GtkComboBox *box, gpointer data);
+static gboolean output_overlaps (GnomeOutputInfo *output, GnomeRRConfig *config);
 
 static void
 error_message (App *app, const char *primary_text, const char *secondary_text)
@@ -649,6 +650,47 @@
 }
 
 static void
+lay_out_outputs_horizontally (App *app)
+{
+    int i;
+    int x;
+
+    /* Lay out all the monitors horizontally when "mirror screens" is turned
+     * off, to avoid having all of them overlapped initially.  We put the
+     * outputs turned off on the right-hand side.
+     */
+
+    x = 0;
+
+    /* First pass, all "on" outputs */
+
+    for (i = 0; app->current_configuration->outputs[i]; ++i)
+    {
+	GnomeOutputInfo *output;
+
+	output = app->current_configuration->outputs[i];
+	if (output->connected && output->on)
+	    output->x = x;
+
+	x += output->width;
+    }
+
+    /* Second pass, all the black screens */
+
+    for (i = 0; app->current_configuration->outputs[i]; ++i)
+    {
+	GnomeOutputInfo *output;
+
+	output = app->current_configuration->outputs[i];
+	if (!(output->connected && output->on))
+	    output->x = x;
+
+	x += output->width;
+    }
+    
+}
+
+static void
 on_clone_changed (GtkWidget *box, gpointer data)
 {
     App *app = data;
@@ -669,6 +711,11 @@
 	    }
 	}
     }
+    else
+    {
+	if (output_overlaps (app->current_output, app->current_configuration))
+	    lay_out_outputs_horizontally (app);
+    }
 
     rebuild_gui (app);
 }