Merge lp:~tintou/slingshot/more-regression-fix into lp:~elementary-pantheon/slingshot/trunk

Proposed by Corentin Noël on 2014-11-08
Status: Merged
Approved by: Cody Garver on 2014-11-09
Approved revision: 480
Merged at revision: 480
Proposed branch: lp:~tintou/slingshot/more-regression-fix
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 16 lines (+2/-2)
1 file modified
src/SlingshotView.vala (+2/-2)
To merge this branch: bzr merge lp:~tintou/slingshot/more-regression-fix
Reviewer Review Type Date Requested Status
elementary Pantheon team 2014-11-08 Pending
Review via email: mp+241173@code.launchpad.net

Commit message

Simplify and fix layout size detection

Description of the change

Removed unnecessary conditions with the slingshot size detection, to test the behavior, set the screen-resolution dconf value to default.
These are fixes for rev 466.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/SlingshotView.vala'
2--- src/SlingshotView.vala 2014-10-17 01:18:02 +0000
3+++ src/SlingshotView.vala 2014-11-08 10:54:13 +0000
4@@ -120,11 +120,11 @@
5 Slingshot.settings.screen_resolution = @"$(screen.get_width ())x$(screen.get_height ())";
6 default_columns = 5;
7 default_rows = 3;
8- while ((calculate_grid_width () + 2 * Pixels.PADDING >= 2 * screen.get_width () / 3)) {
9+ while ((calculate_grid_width () >= 2 * screen.get_width () / 3)) {
10 default_columns--;
11 }
12
13- while ((calculate_grid_height () + Pixels.BOTTOM_SPACE >= 2 * screen.get_height () / 3)) {
14+ while ((calculate_grid_height () >= 2 * screen.get_height () / 3)) {
15 default_rows--;
16 }
17

Subscribers

People subscribed via source and target branches