Hello community, here is the log from the commit of package notify-osd for openSUSE:Factory checked in at 2014-12-21 12:04:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/notify-osd (Old) and /work/SRC/openSUSE:Factory/.notify-osd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notify-osd" Changes: -------- --- /work/SRC/openSUSE:Factory/notify-osd/notify-osd.changes 2012-10-03 08:05:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.notify-osd.new/notify-osd.changes 2014-12-21 12:04:12.000000000 +0100 @@ -1,0 +2,24 @@ +Wed Dec 3 13:30:50 UTC 2014 - [email protected] + +- Update to 0.9.35~bzr20140819 (changes since 0.3.34): + * Don't crash when an application is fullscreen when a + notification arrives. (lp#1189281) + * Have the tests depend on at-spi2-core. + * Return correct notification ID to clients. (lp#1191565) + * Allow being replaced by a different notification service. + * Update contents of a synchronous notification when replacing + it. (lp#404658) + * Avoid invalid call to g_source_remove(). (lp#1257717) + * Clear the reference when we g_source_remove the timers so we + don't attempt to remove them again in the dispose function. + * Make 'focus-follow' the default for Multihead environments. + * Don't place bubbles over panels on secondary monitors Using + heuristics to find panels didn't prove to be very stable. + Instead, use _NET_WORKAREA to find out about the panel size on + the primary monitor and assume it's the same on every other + monitor as well. + * Add missing "make" and "libnotify-bin" autopkgtest + dependencies, and show test log on failure. +- Update notify-osd-leolik.patch. + +------------------------------------------------------------------- Old: ---- notify-osd-0.9.34.tar.gz New: ---- notify-osd_0.9.35+14.10.20140819.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notify-osd.spec ++++++ --- /var/tmp/diff_new_pack.q3dpHI/_old 2014-12-21 12:04:13.000000000 +0100 +++ /var/tmp/diff_new_pack.q3dpHI/_new 2014-12-21 12:04:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package notify-osd # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,63 +16,68 @@ # +%define _version 0.9.35+14.10.20140819 Name: notify-osd -Version: 0.9.34 +Version: 0.9.35~bzr20140819 Release: 0 Summary: Streamlined Notification Daemon License: GPL-3.0+ Group: System/X11/Utilities Url: https://launchpad.net/notify-osd -Source: %{name}-%{version}.tar.gz +Source: http://archive.ubuntu.com/ubuntu/pool/main/n/notify-osd/%{name}_%{_version}.orig.tar.gz # PATCH-FEATURE-UPSTREAM notify-osd-leolik.patch -- Extend the configuration capabilities, patch by Roman Sukochev (Leolik). Taken from https://launchpad.net/~leolik/+archive/leolik. Note that upstream didn't accept this patch. Patch0: notify-osd-leolik.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: fdupes +BuildRequires: gnome-common +BuildRequires: intltool BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.1.6 +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libwnck-3.0) -# Both packages provide {_datadir}/dbus-1/services/org.freedesktop.Notifications.service +BuildRequires: pkgconfig(pixman-1) Conflicts: notification-daemon -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%glib2_gsettings_schema_requires +%{glib2_gsettings_schema_requires} %description -This notification daemon is an alternative to the notification-daemon -package. It follows the freedesktop notification specification and -introduces some new policies for streamlining the user-experience by -discouraging the use of actions and timeouts. +This notification daemon is an alternative to the +mate-notification-daemon package. It follows the freedesktop +notification specification and introduces some new policies for +streamlining the user-experience by discouraging the use of actions +and timeouts. %prep -%setup -q -%patch0 -p0 +%setup -q -n %{name}-%{_version} +%patch0 %build +autoreconf -fi %configure -%__make %{?_smp_mflags} +make %{?_smp_mflags} %install -%makeinstall -%fdupes %{buildroot}%{_datadir}/%{name} - -%clean -rm -rf %{buildroot} +%make_install +%fdupes %{buildroot}%{_datadir} %post -%glib2_gsettings_schema_post +%{glib2_gsettings_schema_post} %postun -%glib2_gsettings_schema_postun +%{glib2_gsettings_schema_postun} %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING NEWS README TODO +%defattr(-,root,root) +%doc AUTHORS NEWS README TODO +%{_libexecdir}/%{name} %{_datadir}/%{name}/ %{_datadir}/dbus-1/services/org.freedesktop.Notifications.service %{_datadir}/glib-2.0/schemas/com.canonical.NotifyOSD.gschema.xml -%dir %{_datadir}/GConf -%dir %{_datadir}/GConf/gsettings +%dir %{_datadir}/GConf/ +%dir %{_datadir}/GConf/gsettings/ %{_datadir}/GConf/gsettings/notify-osd.convert -%{_libexecdir}/%{name} %changelog ++++++ notify-osd-leolik.patch ++++++ --- /var/tmp/diff_new_pack.q3dpHI/_old 2014-12-21 12:04:13.000000000 +0100 +++ /var/tmp/diff_new_pack.q3dpHI/_new 2014-12-21 12:04:13.000000000 +0100 @@ -1,8 +1,7 @@ -Index: src/bubble.c -=================================================================== ---- src/bubble.c.orig -+++ src/bubble.c -@@ -128,25 +128,25 @@ enum +diff -ruN src_old/bubble.c src/bubble.c +--- src_old/bubble.c 2014-02-13 19:54:04.000000000 +0400 ++++ src/bubble.c 2014-04-20 16:36:17.000000000 +0400 +@@ -136,25 +136,25 @@ // FIXME: this is in class Defaults already, but not yet hooked up so for the // moment we use the macros here, these values reflect the visual-guideline // for jaunty notifications @@ -42,7 +41,181 @@ #define INDICATOR_UNLIT_R 1.0f #define INDICATOR_UNLIT_G 1.0f -@@ -3377,6 +3377,8 @@ bubble_recalc_size (Bubble *self) +@@ -175,6 +175,10 @@ + #define BUBBLE_CONTENT_BLUR_RADIUS 4 + #define TEXT_DROP_SHADOW_SIZE 2 + ++gboolean BUBBLE_PREVENT_FADE = TRUE; ++gboolean BUBBLE_CLOSE_ON_CLICK = FALSE; ++gboolean BUBBLE_AS_DESKTOP_BG = FALSE; ++ + //-- private functions --------------------------------------------------------- + + static guint g_bubble_signals[LAST_SIGNAL] = { 0 }; +@@ -735,17 +739,32 @@ + 2.0f * EM2PIXELS (get_shadow_size (self), d)); + cairo_fill (cr); + cairo_set_operator (cr, CAIRO_OPERATOR_OVER); +- cairo_set_source_rgba (cr, +- color.red, +- color.green, +- color.blue, +- BUBBLE_BG_COLOR_A); ++ if (BUBBLE_AS_DESKTOP_BG) { ++ cairo_set_source_rgba (cr, ++ color.red, ++ color.green, ++ color.blue, ++ BUBBLE_BG_COLOR_A); ++ } else { ++ cairo_set_source_rgba (cr, ++ BUBBLE_BG_COLOR_R, ++ BUBBLE_BG_COLOR_G, ++ BUBBLE_BG_COLOR_B, ++ BUBBLE_BG_COLOR_A); ++ } + } + else +- cairo_set_source_rgb (cr, +- color.red, +- color.green, +- color.blue); ++ if (BUBBLE_AS_DESKTOP_BG) { ++ cairo_set_source_rgb (cr, ++ color.red, ++ color.green, ++ color.blue); ++ } else { ++ cairo_set_source_rgb (cr, ++ BUBBLE_BG_COLOR_R, ++ BUBBLE_BG_COLOR_G, ++ BUBBLE_BG_COLOR_B); ++ } + + draw_round_rect ( + cr, +@@ -1646,15 +1665,23 @@ + // sanity check + if (!window) + return; +- +- // set an 1x1 input-region to allow click-through +- region = cairo_region_create_rectangle (&rect); +- if (cairo_region_status (region) == CAIRO_STATUS_SUCCESS) ++ ++ if (!BUBBLE_CLOSE_ON_CLICK) ++ { ++ // set an 1x1 input-region to allow click-through ++ region = cairo_region_create_rectangle (&rect); ++ if (cairo_region_status (region) == CAIRO_STATUS_SUCCESS) ++ { ++ gtk_widget_input_shape_combine_region (window, NULL); ++ gtk_widget_input_shape_combine_region (window, region); ++ } ++ cairo_region_destroy (region); ++ } ++ else + { +- gtk_widget_input_shape_combine_region (window, NULL); +- gtk_widget_input_shape_combine_region (window, region); ++ GdkWindow *window_ = gtk_widget_get_window (window); ++ gdk_window_set_events (window_, gdk_window_get_events (window_) | GDK_BUTTON_PRESS); + } +- cairo_region_destroy (region); + } + + static void +@@ -1744,7 +1771,7 @@ + cairo_paint (cr); + cairo_set_operator (cr, CAIRO_OPERATOR_OVER); + +- if (priv->prevent_fade || !priv->composited) ++ if (!BUBBLE_PREVENT_FADE || priv->prevent_fade || !priv->composited) + { + // render drop-shadow and bubble-background + _render_background (bubble, cr, 1.0f, 0.0f); +@@ -1777,6 +1804,29 @@ + } + + static gboolean ++button_press_event_handler (GtkWidget* window G_GNUC_UNUSED, ++ GdkEventButton* event, ++ Bubble* bubble) ++{ ++ BubblePrivate *priv = GET_PRIVATE (bubble); ++ ++ if (priv->mouse_over && event->button == 1) ++ { ++ bubble_hide (bubble); ++ ++ dbus_send_close_signal (bubble_get_sender (bubble), ++ bubble_get_id (bubble), ++ 1); ++ ++ g_signal_emit (bubble, g_bubble_signals[TIMED_OUT], 0); ++ ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static gboolean + redraw_handler (Bubble* bubble) + { + GtkWindow* window; +@@ -1800,7 +1850,7 @@ + + if (priv->alpha == NULL) + { +- if (priv->distance < 1.0f && !priv->prevent_fade) ++ if (priv->distance < 1.0f && !priv->prevent_fade && BUBBLE_PREVENT_FADE) + { + gtk_window_set_opacity (window, + WINDOW_MIN_OPACITY + +@@ -1955,7 +2005,7 @@ + + // mark mouse-pointer having left bubble and proximity-area + // after inital show-up of bubble +- if (priv->prevent_fade && priv->distance > 1.0f) ++ if (BUBBLE_PREVENT_FADE && priv->prevent_fade && priv->distance > 1.0f) + priv->prevent_fade = FALSE; + } + +@@ -2251,6 +2301,14 @@ + G_CALLBACK (expose_handler), + this); + ++ if (BUBBLE_CLOSE_ON_CLICK) ++ { ++ g_signal_connect (window, ++ "button-press-event", ++ G_CALLBACK (button_press_event_handler), ++ this); ++ } ++ + // "clear" input-mask, set title/icon/attributes + gtk_widget_set_app_paintable (window, TRUE); + gtk_window_set_title (GTK_WINDOW (window), "notify-osd"); +@@ -2730,7 +2788,7 @@ + + priv = GET_PRIVATE (self); + +- if (priv->prevent_fade) ++ if (BUBBLE_PREVENT_FADE && priv->prevent_fade) + return FALSE; + + return priv->mouse_over; +@@ -2834,7 +2892,7 @@ + + // check if mouse-pointer is over bubble (and proximity-area) initially + pointer_update (self); +- if (priv->distance <= 1.0f) ++ if (priv->distance <= 1.0f || !BUBBLE_PREVENT_FADE) + priv->prevent_fade = TRUE; + else + priv->prevent_fade = FALSE; +@@ -3397,6 +3455,8 @@ gint old_bubble_height = 0; gint new_bubble_width = 0; gint new_bubble_height = 0; @@ -51,7 +224,7 @@ Defaults* d; BubblePrivate* priv; -@@ -3571,6 +3573,13 @@ bubble_recalc_size (Bubble *self) +@@ -3591,6 +3651,13 @@ _refresh_body (self); update_shape (self); @@ -65,11 +238,10 @@ } void -Index: src/defaults.c -=================================================================== ---- src/defaults.c.orig -+++ src/defaults.c -@@ -114,40 +114,41 @@ enum +diff -ruN src_old/defaults.c src/defaults.c +--- src_old/defaults.c 2014-02-13 19:54:26.000000000 +0400 ++++ src/defaults.c 2014-04-20 17:35:51.226067000 +0400 +@@ -104,40 +104,41 @@ /* these values are interpreted as em-measurements and do comply to the * visual guide for jaunty-notifications */ #define DEFAULT_DESKTOP_BOTTOM_GAP 6.0f @@ -128,7 +300,7 @@ /* notify-osd settings */ #define NOTIFY_OSD_SCHEMA "com.canonical.notify-osd" -@@ -280,7 +281,7 @@ _get_gravity (Defaults* self) +@@ -236,7 +237,7 @@ gravity = g_settings_get_int (self->nosd_settings, GSETTINGS_GRAVITY_KEY); // protect against out-of-bounds values for gravity @@ -137,7 +309,7 @@ gravity = DEFAULT_GRAVITY; // update stored DPI-value -@@ -764,7 +765,7 @@ defaults_init (Defaults* self) +@@ -474,7 +475,7 @@ self); // use fixed slot-allocation for async. and sync. bubbles @@ -146,7 +318,7 @@ } static void -@@ -1764,7 +1765,7 @@ defaults_class_init (DefaultsClass* klas +@@ -1335,7 +1336,7 @@ "gravity", "Positional hint for placing bubbles", 0, @@ -155,18 +327,35 @@ DEFAULT_GRAVITY, G_PARAM_CONSTRUCT | G_PARAM_READWRITE | -Index: src/defaults.h -=================================================================== ---- src/defaults.h.orig -+++ src/defaults.h -@@ -58,7 +58,13 @@ typedef enum +@@ -1373,6 +1374,17 @@ + return self->desktop_height; + } + ++gint ++defaults_get_desktop_left (Defaults* self) ++{ ++ gint left_edge; ++ ++ if (!self || !IS_DEFAULTS (self)) ++ return 0; ++ ++ return self->desktop_left; ++} ++ + gdouble + defaults_get_desktop_bottom_gap (Defaults* self) + { +diff -ruN src_old/defaults.h src/defaults.h +--- src_old/defaults.h 2014-02-13 19:54:26.000000000 +0400 ++++ src/defaults.h 2014-04-20 17:35:16.910066000 +0400 +@@ -59,7 +59,13 @@ { GRAVITY_NONE = 0, GRAVITY_NORTH_EAST, // top-right of screen - GRAVITY_EAST // vertically centered at right of screen + GRAVITY_EAST, // vertically centered at right of screen -+ GRAVITY_SOUTH_EAST, // bottom-left of screen -+ GRAVITY_SOUTH_WEST, // bottom-right of screen ++ GRAVITY_SOUTH_EAST, // bottom-right of screen ++ GRAVITY_SOUTH_WEST, // bottom-left of screen + GRAVITY_WEST, // vertically centered at left of screen + GRAVITY_NORTH_WEST // top-left of screen + @@ -174,12 +363,19 @@ } Gravity; typedef enum -Index: src/display.c -=================================================================== ---- src/display.c.orig -+++ src/display.c -@@ -310,8 +310,10 @@ stack_layout (Stack* self) - return; +@@ -79,6 +85,7 @@ + GSettings* gnome_settings; + gint desktop_width; + gint desktop_height; ++ gint desktop_left; + gdouble desktop_bottom_gap; + gdouble stack_height; + gdouble bubble_vert_gap; +diff -ruN src_old/display.c src/display.c +--- src_old/display.c 2014-02-13 19:54:04.000000000 +0400 ++++ src/display.c 2014-04-20 16:36:17.000000000 +0400 +@@ -314,8 +314,10 @@ + return FALSE; } + /* @@ -187,12 +383,11 @@ defaults_get_on_screen_timeout (self->defaults)); + */ - defaults_get_top_corner (self->defaults, &x, &y); + defaults_get_top_corner (self->defaults, &screen, &x, &y); -Index: src/main.c -=================================================================== ---- src/main.c.orig -+++ src/main.c +diff -ruN src_old/main.c src/main.c +--- src_old/main.c 2014-02-13 19:54:04.000000000 +0400 ++++ src/main.c 2014-04-20 16:36:17.000000000 +0400 @@ -25,6 +25,10 @@ ** with this program. If not, see <http://www.gnu.org/licenses/>. ** @@ -204,7 +399,7 @@ #include <string.h> #include <stdlib.h> -@@ -39,6 +43,197 @@ +@@ -39,6 +43,213 @@ #define ICONS_DIR (DATADIR G_DIR_SEPARATOR_S "notify-osd" G_DIR_SEPARATOR_S "icons") @@ -242,6 +437,10 @@ +extern float DEFAULT_ICON_SIZE; +extern float DEFAULT_GAUGE_SIZE; + ++extern gboolean BUBBLE_PREVENT_FADE; ++extern gboolean BUBBLE_CLOSE_ON_CLICK; ++extern gboolean BUBBLE_AS_DESKTOP_BG; ++ +void parse_color(unsigned int c, float* r, float* g, float* b) +{ + *b = (float)(c & 0xFF) / (float)(0xFF); @@ -387,6 +586,18 @@ + sscanf(value, "%f", &fvalue) ) { + DEFAULT_GAUGE_SIZE = fvalue*0.1; + ++ } else if (!strcmp(key, "bubble-prevent-fade") && ++ sscanf(value, "%d", &ivalue) ) { ++ BUBBLE_PREVENT_FADE = ivalue; ++ ++ } else if (!strcmp(key, "bubble-close-on-click") && ++ sscanf(value, "%d", &ivalue) ) { ++ BUBBLE_CLOSE_ON_CLICK = ivalue; ++ ++ } else if (!strcmp(key, "bubble-as-desktop-bg") && ++ sscanf(value, "%d", &ivalue) ) { ++ BUBBLE_AS_DESKTOP_BG = ivalue; ++ + } + + } @@ -402,7 +613,7 @@ int main (int argc, char** argv) -@@ -58,6 +253,8 @@ main (int argc, +@@ -58,6 +269,8 @@ gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), ICONS_DIR); @@ -411,10 +622,9 @@ defaults = defaults_new (); observer = observer_new (); stack = stack_new (defaults, observer); -Index: src/stack.c -=================================================================== ---- src/stack.c.orig -+++ src/stack.c +diff -ruN src_old/stack.c src/stack.c +--- src_old/stack.c 2014-02-13 19:54:04.000000000 +0400 ++++ src/stack.c 2014-04-20 16:36:17.000000000 +0400 @@ -44,6 +44,7 @@ G_DEFINE_TYPE (Stack, stack, G_TYPE_OBJECT); @@ -423,16 +633,7 @@ /* fwd declaration */ void close_handler (GObject* n, Stack* stack); -@@ -574,6 +575,8 @@ stack_notify_handler (Stack* - { - Bubble* bubble = NULL; - Bubble* app_bubble = NULL; -+ Bubble* bottom_bubble = NULL; -+ gint x, y, temp_x, temp_y; - GValue* data = NULL; - GValue* compat = NULL; - GdkPixbuf* pixbuf = NULL; -@@ -650,6 +653,15 @@ stack_notify_handler (Stack* +@@ -647,6 +648,15 @@ if (body) bubble_set_message_body (bubble, body); @@ -448,44 +649,17 @@ if (new_bubble && bubble_is_append_allowed(bubble)) { app_bubble = find_bubble_for_append(self, bubble); -@@ -747,8 +759,26 @@ stack_notify_handler (Stack* - "..." : icon); - - bubble_determine_layout (bubble); -+ -+ if (defaults_get_gravity (self->defaults) == GRAVITY_SOUTH_EAST) -+ bubble_get_position(bubble, &temp_x, &temp_y); - - bubble_recalc_size (bubble); -+ -+ if (defaults_get_gravity (self->defaults) == GRAVITY_SOUTH_EAST) -+ { -+ bubble_get_position(bubble, &x, &y); -+ y = y - temp_y; -+ -+ if (self->slots[SLOT_TOP] == bubble) -+ { -+ -+ bottom_bubble = self->slots[SLOT_BOTTOM]; -+ bubble_get_position(bottom_bubble, &temp_x, &temp_y); -+ bubble_move(bottom_bubble, temp_x, temp_y + y); -+ } -+ } -+ - - if (bubble_is_synchronous (bubble)) - { -@@ -948,8 +978,7 @@ stack_get_slot_position (Stack* self, +@@ -958,8 +968,7 @@ case SLOT_ALLOCATION_FIXED: *y += EM2PIXELS (defaults_get_icon_size (d), d) + 2 * EM2PIXELS (defaults_get_margin_size (d), d) + - EM2PIXELS (defaults_get_bubble_vert_gap (d), d); /* + -- 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d), d);*/ +- 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d);*/ + EM2PIXELS (defaults_get_bubble_vert_gap (d), d) + 2; break; case SLOT_ALLOCATION_DYNAMIC: -@@ -965,6 +994,161 @@ stack_get_slot_position (Stack* self, +@@ -975,6 +984,161 @@ } break; @@ -500,12 +674,12 @@ + *y += defaults_get_desktop_height (d) / 2 - + EM2PIXELS (defaults_get_bubble_vert_gap (d) / 2.0f, d) - + bubble_height + -+ EM2PIXELS (defaults_get_bubble_shadow_size (d), d); ++ EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d); + // the position for the async. bubble + else if (slot == SLOT_BOTTOM) + *y += defaults_get_desktop_height (d) / 2 + + EM2PIXELS (defaults_get_bubble_vert_gap (d) / 2.0f, d) - -+ EM2PIXELS (defaults_get_bubble_shadow_size (d), d); ++ EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d); + break; + + case GRAVITY_NORTH_WEST: @@ -527,7 +701,7 @@ + g_assert (stack_is_slot_vacant (self, SLOT_TOP) == OCCUPIED); + *y += bubble_get_height (self->slots[SLOT_TOP]) + + EM2PIXELS (defaults_get_bubble_vert_gap (d), d) - -+ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d), d); ++ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d); + break; + + default: @@ -548,7 +722,7 @@ + *y += defaults_get_desktop_height (d) - + 2 * EM2PIXELS (defaults_get_bubble_vert_gap (d), d) - + bubble_height + -+ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d), d); ++ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d); + + } + @@ -559,7 +733,7 @@ + EM2PIXELS (defaults_get_icon_size (d), d) - + 2 * EM2PIXELS (defaults_get_margin_size (d), d) - + 3 * EM2PIXELS (defaults_get_bubble_vert_gap (d), d) + -+ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d), d) - 2; ++ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d) - 2; + + } + break; @@ -570,7 +744,7 @@ + *y += defaults_get_desktop_height (d) - + 2 * EM2PIXELS (defaults_get_bubble_vert_gap (d), d) - + bubble_height + -+ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d), d); ++ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d); + } + + if (slot == SLOT_BOTTOM) @@ -579,7 +753,7 @@ + *y += defaults_get_desktop_height (d) - + 3 * EM2PIXELS (defaults_get_bubble_vert_gap (d), d) - + bubble_height + -+ 4 * EM2PIXELS (defaults_get_bubble_shadow_size (d), d) - ++ 4 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d) - + bubble_get_height (self->slots[SLOT_TOP]); + } + break; @@ -603,7 +777,7 @@ + *y += defaults_get_desktop_height (d) - + 2 * EM2PIXELS (defaults_get_bubble_vert_gap (d), d) - + bubble_height + -+ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d), d); ++ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d); + + } + @@ -614,7 +788,7 @@ + EM2PIXELS (defaults_get_icon_size (d), d) - + 2 * EM2PIXELS (defaults_get_margin_size (d), d) - + 3 * EM2PIXELS (defaults_get_bubble_vert_gap (d), d) + -+ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d), d) - 2; ++ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d) - 2; + + } + break; @@ -625,7 +799,7 @@ + *y += defaults_get_desktop_height (d) - + 2 * EM2PIXELS (defaults_get_bubble_vert_gap (d), d) - + bubble_height + -+ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d), d); ++ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d); + } + + if (slot == SLOT_BOTTOM) @@ -634,7 +808,7 @@ + *y += defaults_get_desktop_height (d) - + 3 * EM2PIXELS (defaults_get_bubble_vert_gap (d), d) - + bubble_height + -+ 4 * EM2PIXELS (defaults_get_bubble_shadow_size (d), d) - ++ 4 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d) - + bubble_get_height (self->slots[SLOT_TOP]); + } + break; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
