qtubuntu

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

  1. panelHeight
  2. Merge into trunk
Proposed by Lukáš Tinkl on 2015-11-26
Status: Merged
Approved by: Gerry Boland on 2015-11-27
Approved revision: 294
Merged at revision: 299
Proposed branch: lp:~lukas-kde/qtubuntu/panelHeight
Merge into: lp:qtubuntu
Diff against target: 22 lines (+2/-3)
1 file modified
src/ubuntumirclient/window.cpp (+2/-3)
To merge this branch: bzr merge lp:~lukas-kde/qtubuntu/panelHeight
Reviewer Review Type Date Requested Status
Gerry Boland 2015-11-26 Approve on 2015-11-27
PS Jenkins bot continuous-integration Approve on 2015-11-26
Review via email: mp+278718@code.launchpad.net

Commit Message

Update the panel height hack, orange line is gone

Description of the Change

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

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntumirclient/window.cpp'
2--- src/ubuntumirclient/window.cpp 2015-11-17 13:42:24 +0000
3+++ src/ubuntumirclient/window.cpp 2015-11-26 15:45:27 +0000
4@@ -215,7 +215,7 @@
5 }
6
7 // FIXME - in order to work around https://bugs.launchpad.net/mir/+bug/1346633
8-// we need to guess the panel height (3GU + 2DP)
9+// we need to guess the panel height (3GU)
10 int panelHeight()
11 {
12 const int defaultGridUnit = 8;
13@@ -228,8 +228,7 @@
14 gridUnit = defaultGridUnit;
15 }
16 }
17- qreal densityPixelRatio = static_cast<qreal>(gridUnit) / defaultGridUnit;
18- return gridUnit * 3 + qFloor(densityPixelRatio) * 2;
19+ return gridUnit * 3;
20 }
21
22 } //namespace

Subscribers

People subscribed via source and target branches