Don't remove updateIconPos.

(bzr r2844.2.2)

2 files changed, 24 insertions, 6 deletions

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 86494147b..95c6958ef 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -676,6 +676,18 @@ void UnityScreen::paintPanelShadow(const CompRegion& clip)
 nuxEpilogue();
 }
 
+void
+UnityWindow::updateIconPos (int &wx,
+ int &wy,
+ int x,
+ int y,
+ float width,
+ float height)
+{
+ wx = x + (last_bound.width - width) / 2;
+ wy = y + (last_bound.height - height) / 2;
+}
+
 void UnityScreen::OnPanelStyleChanged()
 {
 panel_texture_has_changed_ = true;
@@ -841,18 +853,21 @@ void UnityWindow::paintThumbnail (nux::Geometry const& bounding, float alpha)
 GLMatrix matrix;
 matrix.toScreenSpace (UnityScreen::get (screen)->_last_output, -DEFAULT_Z_CAMERA);
 
+ nux::Geometry geo = bounding;
+ last_bound = geo;
+
 GLWindowPaintAttrib attrib = gWindow->lastPaintAttrib ();
 attrib.opacity = (GLushort) (alpha * G_MAXUSHORT);
 
 paintThumb (attrib,
 matrix,
 0,
- bounding.x,
- bounding.y,
- bounding.width,
- bounding.height,
- bounding.width,
- bounding.height);
+ geo.x,
+ geo.y,
+ geo.width,
+ geo.height,
+ geo.width,
+ geo.height);
 }
 
 void UnityScreen::EnableCancelAction(CancelActionTarget target, bool enabled, int modifiers)
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index 05e5988c3..81dc78eda 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -359,6 +359,8 @@ public:
 CompWindow* window;
 GLWindow* gWindow;
 
+ nux::Geometry last_bound;
+
 void minimize();
 void unminimize();
 bool minimized();
@@ -374,6 +376,7 @@ public:
 /* basic window draw function */
 bool glDraw(GLMatrix const&, GLWindowPaintAttrib const&, CompRegion const&, unsigned mask);
 
+ void updateIconPos (int &wx, int &wy, int x, int y, float width, float height);
 void windowNotify(CompWindowNotify n);
 void moveNotify(int x, int y, bool immediate);
 void resizeNotify(int x, int y, int w, int h);