Merge lp:~lukas-kde/qtubuntu/panelHeight into lp:qtubuntu

[Lukáš Tinkl]

Update the panel height hack, orange line is gone

Following the removal of the orange separator line from panel, adjust the panelHeight hack to no longer take it into account

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:294
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/282/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/73/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/282/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM

review: Approve

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2015-11-17 13:42:24 +0000
+++ src/ubuntumirclient/window.cpp	2015-11-26 15:45:27 +0000
@@ -215,7 +215,7 @@
 }
 
 // FIXME - in order to work around https://bugs.launchpad.net/mir/+bug/1346633
-// we need to guess the panel height (3GU + 2DP)
+// we need to guess the panel height (3GU)
 int panelHeight()
 {
     const int defaultGridUnit = 8;
@@ -228,8 +228,7 @@
             gridUnit = defaultGridUnit;
         }
     }
-    qreal densityPixelRatio = static_cast<qreal>(gridUnit) / defaultGridUnit;
-    return gridUnit * 3 + qFloor(densityPixelRatio) * 2;
+    return gridUnit * 3;
 }
 
 } //namespace