← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cairo-dock/oneiric-201110111206

« back to all changes in this revision

Viewing changes to debian/patches/02-mouse-leaves-on-the-edge_upstream-version-2.3.0~2.1.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2011-05-21 21:03:26 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20110521210326-x3nr4s63nys6a10j
Tags: 2.3.0~2-0ubuntu1
https://launchpad.net/bugs/786104
https://launchpad.net/bugs/773280
* New upstream release. (LP: #786104)
* Upstream ChangeLog:
 - Fixed a crash that occured when a class sub-dock was destroyed
    (LP: #773280)
 - Fixed a major bug where the dock couldn't re-appear after a
    menu has been triggerd from outside the dock (ie, from a shortcut)
* debian/patches:
 - Added an upstream's patch to fix an annoying bug when we slowly
    leave the dock with the cursor on the edge of it

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02-mouse-leaves-on-the-edge_upstream-version-2.3.0~2.1.patch
 
1
From: Matthieu Baerts <matttbe@gmail.com>
 
2
Subject: Fixed an annoying bug when we slowly leave the dock with the cursor on the edge of it
 
3
Origin: upstream, http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-core/2.3.x/revision/757
 
4
Bug: http://www.glx-dock.org/tt_task.php?p=1&t=174
 
5
Forwarded: yes
 
6
 
 
7
Index: cairo-dock/src/gldit/cairo-dock-dock-facility.c
 
8
===================================================================
 
9
--- cairo-dock.orig/src/gldit/cairo-dock-dock-facility.c        2011-05-21 10:52:15.504630255 +0200
 
10
+++ cairo-dock/src/gldit/cairo-dock-dock-facility.c     2011-05-21 10:52:38.494663981 +0200
 
11
@@ -760,11 +760,10 @@
 
12
                }
 
13
                else
 
14
                {
 
15
-                       double fSideMargin = fabs (pDock->fAlign - .5) * (iWidth - pDock->fFlatDockWidth);
 
16
-                       if (x_abs < - fSideMargin || x_abs > pDock->fFlatDockWidth + fSideMargin)
 
17
-                               iMousePositionType = CAIRO_DOCK_MOUSE_OUTSIDE;
 
18
-                       else
 
19
+                       if (iMouseY >= 0 && iMouseY < iHeight)
 
20
                                iMousePositionType = CAIRO_DOCK_MOUSE_ON_THE_EDGE;
 
21
+                       else
 
22
+                               iMousePositionType = CAIRO_DOCK_MOUSE_OUTSIDE;
 
23
                }
 
24
        }
 
25
        else if (iMouseY >= 0 && iMouseY < iHeight)  // et en plus on est dedans en y.  //  && pPointedIcon != NULL