← Back to branch summary

~ubuntu-branches/ubuntu/utopic/awn-extras-applets/utopic

« back to all changes in this revision

Viewing changes to applets/maintained/notification-daemon/stack.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Lavergne
  • Date: 2010-04-11 22:38:55 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20100411223855-mamzuv887xyms08b
Tags: 0.4.0-0ubuntu1
https://launchpad.net/bugs/511256
https://launchpad.net/bugs/545164
https://launchpad.net/bugs/556175
https://launchpad.net/bugs/558463
https://launchpad.net/bugs/551119
https://launchpad.net/bugs/552376
* New upstream release.
 - Close cairo-menu after a click (LP: #511256)
 - Fix crash of awn-system-monitor (LP: #545164)
 - Fix crash when removing a volume >1 or adding volume >1 or using prefs
   while > 1 volumes is present (LP: #556175)
 - Fix crash of media-control when Rhythmbox quit (LP: #558463)
 - Fix crash of file-browser-launcher when there is no .gtk-bookmarks
   (LP: #551119)
* debian/awn-c-extras.install: 
 - Install icons and ini files for webapplets
* debian/awn-python-core.install:
 - Install ui file for comics (LP: #552376)
* debian/patches:
 - 03-remove-cairo-menu-pref.patch: Merged upstream.
 - 04-tomboy-threading-free.patch: Merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/maintained/notification-daemon/stack.c
114
114
 
115
115
  gtk_widget_get_size_request(GTK_WIDGET(G_daemon_config.awn_app), &aw, &ah);
116
116
  *x = ax - w / 2 + aw / 2;
117
 
  *y = gdk_screen_get_height(gdk_screen_get_default()) - height - G_daemon_config.awn_app_height * 1.5;// + dialog->priv->offset;
118
 
 
 
117
  switch (awn_applet_get_pos_type (G_daemon_config.awn_app) )
 
118
  {
 
119
    case GTK_POS_TOP:
 
120
      *y =  height - G_daemon_config.awn_app_height * 1.5;// + dialog->priv->offset;
 
121
      break;
 
122
    case GTK_POS_LEFT:
 
123
    case GTK_POS_RIGHT:
 
124
      if (ay < (gdk_screen_get_height(gdk_screen_get_default())/2))
 
125
      {
 
126
        *y =  G_daemon_config.awn_app_height * 1.5;// + dialog->priv->offset;
 
127
      }
 
128
      else
 
129
      {
 
130
        *y = gdk_screen_get_height(gdk_screen_get_default()) - height - G_daemon_config.awn_app_height * 1.5;// + dialog->priv->offset;
 
131
      }
 
132
      break;
 
133
    case GTK_POS_BOTTOM:
 
134
    default:
 
135
      *y = gdk_screen_get_height(gdk_screen_get_default()) - height - G_daemon_config.awn_app_height * 1.5;// + dialog->priv->offset;
 
136
  }
119
137
  if (G_daemon_config.awn_override_y >= 0)
120
138
    *y = G_daemon_config.awn_override_y;
121
139
 
246
264
  get_work_area(GTK_WIDGET(nw), &workarea);
247
265
  get_origin_coordinates(stack->location, &workarea, &x, &y,
248
266
                         &shiftx, &shifty, init_width, init_height);
249
 
 
250
267
  if (nw_x != NULL)
251
268
    *nw_x = x;
252
269