~ubuntu-branches/ubuntu/oneiric/unity/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/debian-changes-4.22.0-0ubuntu3

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-10-07 09:03:50 UTC
  • Revision ID: james.westby@ubuntu.com-20111007090350-56xw1pt9tdlpc2fg
Tags: 4.22.0-0ubuntu3
* Cherry-pick upstream:
  - Resize the _gradient_texture (in PanelMenuView::Draw) if needed
    (LP: #863068, #868293, #869028)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Description: Upstream changes introduced in version 4.22.0-0ubuntu3
 
2
 This patch has been created by dpkg-source during the package build.
 
3
 Here's the last changelog entry, hopefully it gives details on why
 
4
 those changes were made:
 
5
 .
 
6
 unity (4.22.0-0ubuntu3) oneiric; urgency=low
 
7
 .
 
8
   * Cherry-pick upstream:
 
9
     - Resize the _gradient_texture (in PanelMenuView::Draw) if needed
 
10
       (LP: #863068, #868293, #869028)
 
11
 .
 
12
 The person named in the Author field signed this changelog entry.
 
13
Author: Didier Roche <didrocks@ubuntu.com>
 
14
Bug-Ubuntu: https://bugs.launchpad.net/bugs/863068
 
15
Bug-Ubuntu: https://bugs.launchpad.net/bugs/868293
 
16
Bug-Ubuntu: https://bugs.launchpad.net/bugs/869028
 
17
 
 
18
---
 
19
The information above should follow the Patch Tagging Guidelines, please
 
20
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
 
21
are templates for supplementary fields that you might want to add:
 
22
 
 
23
Origin: <vendor|upstream|other>, <url of original patch>
 
24
Bug: <url in upstream bugtracker>
 
25
Bug-Debian: http://bugs.debian.org/<bugnumber>
 
26
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 
27
Forwarded: <no|not-needed|url proving that it has been forwarded>
 
28
Reviewed-By: <name and email of someone who approved the patch>
 
29
Last-Update: <YYYY-MM-DD>
 
30
 
 
31
--- unity-4.22.0.orig/services/CMakeLists.txt
 
32
+++ unity-4.22.0/services/CMakeLists.txt
 
33
@@ -39,7 +39,7 @@ set(CFLAGS
 
34
     "-DGETTEXT_PACKAGE=\"unity\""
 
35
     "-DINDICATORDIR=\"${_indicatordir}\""
 
36
     "-DINDICATORICONDIR=\"${_iconsdir}\""
 
37
-    "-Werror -Wall"
 
38
+    "-Wall"
 
39
     )
 
40
 add_definitions(${CFLAGS})
 
41
 
 
42
--- unity-4.22.0.orig/plugins/unityshell/src/PanelMenuView.cpp
 
43
+++ unity-4.22.0/plugins/unityshell/src/PanelMenuView.cpp
 
44
@@ -447,7 +447,7 @@ PanelMenuView::Draw(nux::GraphicsEngine&
 
45
       lockrect.pBits = 0;
 
46
       bool locked = false;
 
47
 
 
48
-      if (_gradient_texture.IsNull())
 
49
+      if (_gradient_texture.IsNull() || (_gradient_texture->GetWidth() != geo.width))
 
50
       {
 
51
         build_gradient = true;
 
52
       }
 
53
--- unity-4.22.0.orig/plugins/unityshell/src/unityshell.cpp
 
54
+++ unity-4.22.0/plugins/unityshell/src/unityshell.cpp
 
55
@@ -1703,7 +1703,7 @@ void UnityWindow::windowNotify(CompWindo
 
56
         if (!focusdesktop_handle_)
 
57
            focusdesktop_handle_ = g_timeout_add (1000, &UnityWindow::FocusDesktopTimeout, this);
 
58
       }
 
59
-      break;
 
60
+    /* Fall through an re-evaluate wraps on map and unmap too */
 
61
     case CompWindowNotifyUnmap:
 
62
       if (UnityScreen::get (screen)->optionGetShowMinimizedWindows () &&
 
63
           window->mapNum ())