Made some minor cosmetic changes and sorted images.grc alphabetically

diff --git a/images.qrc b/images.qrc
index fee7479..61a593b 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -8,11 +8,11 @@
         <file>res/images/compass.png</file>
         <file>res/images/envelope.png</file>
         <file>res/images/friend_group.png</file>
+        <file>res/images/gps_position.png</file>
+        <file>res/images/gps_position_s.png</file>
         <file>res/images/large_profile_pic_border_left.png</file>
         <file>res/images/large_profile_pic_border_middle.png</file>
         <file>res/images/large_profile_pic_border_right.png</file>
-        <file>res/images/gps_position.png</file>
-        <file>res/images/gps_position_s.png</file>
         <file>res/images/list_item_bottom.png</file>
         <file>res/images/list_item_middle.png</file>
         <file>res/images/list_item_top.png</file>

diff --git a/src/ui/fullscreenbutton.cpp b/src/ui/fullscreenbutton.cpp
index cc1445f..6ca4806 100644 (file)
--- a/src/ui/fullscreenbutton.cpp
+++ b/src/ui/fullscreenbutton.cpp
@@ -54,13 +54,13 @@ FullScreenButton::FullScreenButton(QWidget *parent) :
     m_selectedGradient->setColorAt(0.98, QColor(115, 215, 255));
 
     // Item shape path
-    m_backgroundPath.moveTo(this->width(), 0);          // Top right corner
+    m_backgroundPath.moveTo(this->width(), 0);              // Top right corner
     m_backgroundPath.lineTo(ROUNDING_ARC_RADIUS, 0);
     m_backgroundPath.arcTo(0, 0, ROUNDING_ARC_RADIUS * 2, ROUNDING_ARC_RADIUS * 2,
                            ROUNDING_ARC_START_ANGLE, ROUNDING_ARC_LENGTH);
-    m_backgroundPath.lineTo(0, this->height());         // Bottom left corner
-    m_backgroundPath.lineTo(width(), this->height());   // Bottom right corner
-    m_backgroundPath.closeSubpath();                    // Back to the beginning
+    m_backgroundPath.lineTo(0, this->height());             // Bottom left corner
+    m_backgroundPath.lineTo(this->width(), this->height()); // Bottom right corner
+    m_backgroundPath.closeSubpath();                        // Back to the beginning
 }
 
 FullScreenButton::~FullScreenButton()

diff --git a/src/ui/zoombuttonpanel.cpp b/src/ui/zoombuttonpanel.cpp
index 7aecc58..de96043 100644 (file)
--- a/src/ui/zoombuttonpanel.cpp
+++ b/src/ui/zoombuttonpanel.cpp
@@ -253,10 +253,12 @@ void ZoomButtonPanel::screenResized(const QSize &newSize)
     m_screenSize = newSize;
 
     QPoint resizedPosition = pos();
+    
     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()))
         resizedPosition.ry() = newSize.height() - rect().height();
     else if (resizedPosition.y() < 0)

diff --git a/src/ui/zoombuttonpanel.h b/src/ui/zoombuttonpanel.h
index e4ccd21..8165751 100644 (file)
--- a/src/ui/zoombuttonpanel.h
+++ b/src/ui/zoombuttonpanel.h
@@ -138,6 +138,9 @@ private slots:
      */
     void timerExpired();
 
+/******************************************************************************
+ * SIGNALS
+ ******************************************************************************/
 signals:
     /**
     * @brief Dragging mode triggered.