[26447] in Source-Commits
/svn/athena r25579 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jun 6 20:29:55 2012
Date: Wed, 6 Jun 2012 20:29:54 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206070029.q570TsDd032242@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-06-06 20:29:54 -0400 (Wed, 06 Jun 2012)
New Revision: 25579
Modified:
trunk/debathena/config/gdm-config/debian/changelog
trunk/debathena/config/gdm-config/debian/debathena-branding
Log:
In gdm-config:
* In a multiple monitor setup, like all the cool kids have, position the
branding and welcome windows on the primary monitor
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2012-06-06 21:05:56 UTC (rev 25578)
+++ trunk/debathena/config/gdm-config/debian/changelog 2012-06-07 00:29:54 UTC (rev 25579)
@@ -1,3 +1,10 @@
+debathena-gdm-config (1.38) unstable; urgency=low
+
+ * In a multiple monitor setup, like all the cool kids have, position the
+ branding and welcome windows on the primary monitor
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 06 Jun 2012 20:20:56 -0400
+
debathena-gdm-config (1.37) unstable; urgency=low
* Update athena-session for the Unity world
Modified: trunk/debathena/config/gdm-config/debian/debathena-branding
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-branding 2012-06-06 21:05:56 UTC (rev 25578)
+++ trunk/debathena/config/gdm-config/debian/debathena-branding 2012-06-07 00:29:54 UTC (rev 25579)
@@ -49,12 +49,16 @@
self.winWelcome = self.xml.get_widget('winWelcome')
self.winWelcome.set_property('can_focus', False)
- moveY = 200
+ # Back in my day, we one monitor. Monochrome.
+ defaultScreen = gtk.gdk.screen_get_default()
+ self.monitorGeometry = defaultScreen.get_monitor_geometry(defaultScreen.get_primary_monitor())
+ moveY = self.monitorGeometry.y + 200
logoScale = 0.60
- if gtk.gdk.screen_height() <= 900:
- moveY = 10
+ if (self.monitorGeometry.height - self.monitorGeometry.y) <= 900:
+ moveY = self.monitorGeometry.y + 10
logoScale = 0.40
- self.winWelcome.move((gtk.gdk.screen_width() - self.winWelcome.get_size()[0]) / 2, moveY)
+ moveX = self.monitorGeometry.x + ((self.monitorGeometry.width - self.winWelcome.get_size()[0]) / 2)
+ self.winWelcome.move(moveX, moveY)
self.imgDebathena = self.xml.get_widget('imgDebathena')
self.imgDebathena.set_property('can_focus', False)
self.animate = self.setup_owl(logoScale)
@@ -76,7 +80,7 @@
self.lblBranding.set_markup(metapackage + "\n" + baseos + "\n" + arch)
self.winBranding.set_gravity(gtk.gdk.GRAVITY_SOUTH_EAST)
width, height = self.winBranding.get_size()
- self.winBranding.move(gtk.gdk.screen_width() - width, gtk.gdk.screen_height() - height)
+ self.winBranding.move(self.monitorGeometry.x + (self.monitorGeometry.width - width), self.monitorGeometry.y + (self.monitorGeometry.height - height))
# Connect to the session manager, and register our client.
def register_with_sm(self):
