From 4664ff3a4b29195eac238ae7415230bbf1d0a268 Mon Sep 17 00:00:00 2001
From: Kaj Wallin <kaj.wallin@ixonos.com>
Date: Fri, 28 May 2010 14:53:18 +0300
Subject: [PATCH] Fixed zoom panel position loading bug.

Reviewed by: Pekka Nissinen
---
 debian/rules               |    2 +-
 src/ui/imagebutton.cpp     |   15 +++++++++------
 src/ui/imagebutton.h       |    9 +++++++++
 src/ui/zoombuttonpanel.cpp |    4 ++--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/debian/rules b/debian/rules
index 60f454a..5c9b2ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@ APPNAME := situare
 builddir:
 	mkdir -p builddir
 builddir/Makefile: builddir
-	cd builddir && /opt/qt4-maemo5/bin/qmake PREFIX=/usr ../$(APPNAME).pro
+	cd builddir && /opt/qt4-maemo5/bin/qmake PREFIX=/usr ../src/src.pro
 build: build-stamp
 
 build-stamp: builddir/Makefile 
diff --git a/src/ui/imagebutton.cpp b/src/ui/imagebutton.cpp
index bd48668..5df7ab9 100644
--- a/src/ui/imagebutton.cpp
+++ b/src/ui/imagebutton.cpp
@@ -43,9 +43,7 @@ ImageButton::ImageButton(QWidget *parent, QString normalIconPictureFileName,
         if(!selectedIconPictureFileName.isEmpty())
             icon.addFile(selectedIconPictureFileName, buttonSize, QIcon::Selected);
 
-        setIcon(icon);
-        setIconSize(buttonSize);
-        setFixedSize(buttonSize);
+        initButton(buttonSize, icon);
     }
 }
 
@@ -56,9 +54,7 @@ void ImageButton::setButtonIcon(const QPixmap &image)
     QSize buttonSize = image.size(); // Get the button size from the normal state icon picture
     QIcon icon(image);
 
-    setIcon(icon);
-    setIconSize(buttonSize);
-    setFixedSize(buttonSize);
+    initButton(buttonSize, icon);
 }
 
 void ImageButton::mousePressEvent(QMouseEvent *event)
@@ -111,3 +107,10 @@ QIcon::Mode ImageButton::mode()
 
     return m_buttonMode;
 }
+
+void ImageButton::initButton(const QSize &size, const QIcon &icon)
+{
+    setIcon(icon);
+    setIconSize(size);
+    setFixedSize(size);
+}
diff --git a/src/ui/imagebutton.h b/src/ui/imagebutton.h
index de6a480..cecd8db 100644
--- a/src/ui/imagebutton.h
+++ b/src/ui/imagebutton.h
@@ -100,6 +100,15 @@ public:
      */
     QIcon::Mode mode();
 
+private:
+    /**
+     * @brief Initializes the button by setting graphics and alpha mask
+     *
+     * @param size Size of the button icon
+     * @param icon Image icon
+     */
+    void initButton(const QSize &size, const QIcon &icon);
+
 /*******************************************************************************
  * DATA MEMBERS
  ******************************************************************************/
diff --git a/src/ui/zoombuttonpanel.cpp b/src/ui/zoombuttonpanel.cpp
index 7757918..d89cc4c 100644
--- a/src/ui/zoombuttonpanel.cpp
+++ b/src/ui/zoombuttonpanel.cpp
@@ -214,8 +214,8 @@ void ZoomButtonPanel::screenResized(const QSize &newSize)
     m_screenSize = newSize;
 
     QPoint resizedPosition = pos();
-    if(resizedPosition.x() > (newSize.width() - rect().width()) - SIDEBAR_WIDTH)
-        resizedPosition.rx() = newSize.width() - rect().width() - SIDEBAR_WIDTH;
+    if(resizedPosition.x() > (newSize.width() - rect().width()))
+        resizedPosition.rx() = newSize.width() - rect().width();
     else if (resizedPosition.x() < SIDEBAR_WIDTH)
         resizedPosition.rx() = SIDEBAR_WIDTH;
     if(resizedPosition.y() > (newSize.height() - rect().height()))
-- 
1.7.9.5