From 31ea3f737c32e230719a5783c72e2140b94a2c1c Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 16 Oct 2012 13:02:48 -0400 Subject: [PATCH] messageTray: Remove hack for the lack of negative units in libcroco libcroco now has native support for negative units. https://bugzilla.gnome.org/show_bug.cgi?id=686240 --- configure.ac | 2 +- data/theme/gnome-shell.css | 2 +- js/ui/messageTray.js | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 73ce9f529..7b10ae9a4 100644 --- a/configure.ac +++ b/configure.ac @@ -120,7 +120,7 @@ CFLAGS=$saved_CFLAGS LIBS=$saved_LIBS PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION) -PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 x11) +PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11) PKG_CHECK_MODULES(TRAY, gtk+-3.0) PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.5.4) diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css index bb571261a..d21c7e937 100644 --- a/data/theme/gnome-shell.css +++ b/data/theme/gnome-shell.css @@ -633,7 +633,7 @@ StScrollBar StButton#vhandle:active { * adjust down 8px */ -shell-close-overlap-x: 15px; - -shell-close-overlap-y: 12px; + -shell-close-overlap-y: -12px; } .window-close:rtl { diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js index 01d038737..9fb7e790a 100644 --- a/js/ui/messageTray.js +++ b/js/ui/messageTray.js @@ -236,9 +236,7 @@ function makeCloseButton() { closeButton.connect('style-changed', function() { let themeNode = closeButton.get_theme_node(); closeButton.translation_x = themeNode.get_length('-shell-close-overlap-x'); - - // libcroco doesn't support negative units - closeButton.translation_y = -themeNode.get_length('-shell-close-overlap-y'); + closeButton.translation_y = themeNode.get_length('-shell-close-overlap-y'); }); return closeButton;