← Back to branch summary

~larry-e-works/uci-engine/amqp-to-kombu

« back to all changes in this revision

Viewing changes to cupstream2distro/tests/data/bzrlogs/logswithignoredchangelog

  • Committer: Francis Ginther
  • Date: 2014-06-10 20:42:46 UTC
  • mto: This revision was merged to the branch mainline in revision 571.
  • Revision ID: francis.ginther@canonical.com-20140610204246-b1bsrik7nlcolqy7
Import lp:cupstream2distro rev 605.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cupstream2distro/tests/data/bzrlogs/logswithignoredchangelog
 
1
------------------------------------------------------------
 
2
revno: 3308
 
3
committer: Marco Trevisan (Treviño) <mail@3v1n0.net>
 
4
branch nick: trunk
 
5
timestamp: Fri 2013-02-08 02:46:52 +0000
 
6
message:
 
7
  Simulating direct commit to trunk #nochangelog
 
8
diff:
 
9
=== modified file 'launcher/EdgeBarrierController.cpp'
 
10
--- launcher/EdgeBarrierController.cpp  2012-12-11 23:38:30 +0000
 
11
+++ launcher/EdgeBarrierController.cpp  2013-02-08 01:00:23 +0000
 
12
@@ -19,6 +19,7 @@
 
13
  */
 
14
 
 
15
 #include "EdgeBarrierController.h"
 
16
+#include "EdgeBarrierControllerPrivate.h"
 
17
 #include "Decaymulator.h"
 
18
 #include "unity-shared/UScreen.h"
 
19
 #include "UnityCore/GLibSource.h"
 
20
------------------------------------------------------------
 
21
revno: 3310 [merge]
 
22
author: Marco Trevisan (Treviño) <mail@3v1n0.net>, Brandon Schaefer <brandon.schaefer@canonical.com>
 
23
committer: Tarmac
 
24
branch nick: trunk
 
25
timestamp: Fri 2013-02-08 02:46:52 +0000
 
26
message:
 
27
  EdgeBarrierController: add multiple types of subscriber results, fix edges on autohide
 
28
 
 
29
  #nochangelog
 
30
  
 
31
  Now when sticky keys are disabled, and the launcher is set to autohide, the mouse will hit both sides of the screen (instead of just the left side o
 
32
f the barrier); at that point we'll release the events coming from the launcher-less side of the monitor, but we'll use them to temporary keep the bar
 
33
rier "broken". Fixes: https://bugs.launchpad.net/bugs/1064945.
 
34
  
 
35
  Approved by Brandon Schaefer.
 
36
diff:
 
37
=== modified file 'launcher/EdgeBarrierController.cpp'
 
38
--- launcher/EdgeBarrierController.cpp  2012-12-11 23:38:30 +0000
 
39
+++ launcher/EdgeBarrierController.cpp  2013-02-08 01:00:23 +0000
 
40
@@ -19,6 +19,7 @@
 
41
  */
 
42
 
 
43
 #include "EdgeBarrierController.h"
 
44
+#include "EdgeBarrierControllerPrivate.h"
 
45
 #include "Decaymulator.h"
 
46
 #include "unity-shared/UScreen.h"
 
47
 #include "UnityCore/GLibSource.h"
 
48
------------------------------------------------------------
 
49
revno: 3312 [merge]
 
50
author: Marco Trevisan (Treviño) <mail@3v1n0.net>
 
51
committer: Tarmac
 
52
branch nick: trunk
 
53
timestamp: Tue 2013-04-23 22:00:39 +0000
 
54
message:
 
55
  IconRenderer: preprocess an icon if its emblem has been shown/hidden
 
56
    
 
57
  In that way we can update its transformation. Fixes: https://bugs.launchpad.net/bugs/1171476, https://bugs.launchpad.net/bugs/1171663.
 
58
  
 
59
  Approved by PS Jenkins bot, Brandon Schaefer.
 
60
diff:
 
61
=== modified file 'unity-shared/IconRenderer.cpp'
 
62
--- unity-shared/IconRenderer.cpp       2013-04-10 21:41:57 +0000
 
63
+++ unity-shared/IconRenderer.cpp       2013-04-23 00:49:38 +0000
 
64
@@ -300,7 +300,8 @@
 
65
     if (it->render_center == launcher_icon->LastRenderCenter(monitor) &&
 
66
         it->logical_center == launcher_icon->LastLogicalCenter(monitor) &&
 
67
         it->rotation == launcher_icon->LastRotation(monitor) &&
 
68
-        it->skip == launcher_icon->WasSkipping(monitor))
 
69
+        it->skip == launcher_icon->WasSkipping(monitor) &&
 
70
+        (launcher_icon->Emblem() != nullptr) == launcher_icon->HadEmblem())
 
71
     {
 
72
       continue;
 
73
     }
 
74
@@ -308,6 +309,7 @@
 
75
     launcher_icon->RememberCenters(monitor, it->render_center, it->logical_center);
 
76
     launcher_icon->RememberRotation(monitor, it->rotation);
 
77
     launcher_icon->RememberSkip(monitor, it->skip);
 
78
+    launcher_icon->RememberEmblem(launcher_icon->Emblem() != nullptr);
 
79
 
 
80
     float w = icon_size;
 
81
     float h = icon_size;
 
82
 
 
83
=== modified file 'unity-shared/IconTextureSource.cpp'
 
84
--- unity-shared/IconTextureSource.cpp  2013-04-12 23:33:52 +0000
 
85
+++ unity-shared/IconTextureSource.cpp  2013-04-23 00:48:47 +0000
 
86
@@ -32,7 +32,8 @@
 
87
 }
 
88
 
 
89
 IconTextureSource::IconTextureSource()
 
90
-  : skip_(RENDERERS_SIZE, false)
 
91
+  : had_emblem_(false)
 
92
+  , skip_(RENDERERS_SIZE, false)
 
93
   , last_render_center_(RENDERERS_SIZE)
 
94
   , last_logical_center_(RENDERERS_SIZE)
 
95
   , last_rotation_(RENDERERS_SIZE)
 
96
@@ -80,5 +81,15 @@
 
97
   return skip_[monitor];
 
98
 }
 
99
 
 
100
+void IconTextureSource::RememberEmblem(bool has_emblem)
 
101
+{
 
102
+  had_emblem_ = has_emblem;
 
103
+}
 
104
+
 
105
+bool IconTextureSource::HadEmblem() const
 
106
+{
 
107
+  return had_emblem_;
 
108
+}
 
109
+
 
110
 }
 
111
 }
 
112
\ No newline at end of file
 
113
 
 
114
=== modified file 'unity-shared/IconTextureSource.h'
 
115
--- unity-shared/IconTextureSource.h    2013-04-12 23:33:52 +0000
 
116
+++ unity-shared/IconTextureSource.h    2013-04-23 00:48:47 +0000
 
117
@@ -58,6 +58,9 @@
 
118
   void RememberSkip(int monitor, bool skip);
 
119
   bool WasSkipping(int monitor) const;
 
120
 
 
121
+  void RememberEmblem(bool has_emblem);
 
122
+  bool HadEmblem() const;
 
123
+
 
124
   virtual nux::Color BackgroundColor() const = 0;
 
125
 
 
126
   virtual nux::Color GlowColor() = 0;
 
127
@@ -67,6 +70,7 @@
 
128
   virtual nux::BaseTexture* Emblem() = 0;
 
129
 
 
130
 private:
 
131
+  bool had_emblem_;
 
132
   std::vector<bool> skip_;
 
133
   std::vector<nux::Point3> last_render_center_;
 
134
   std::vector<nux::Point3> last_logical_center_;
 
135
------------------------------------------------------------