Merge lp:~mefrio-g/pantheon-files/fix-1005013 into lp:~elementary-apps/pantheon-files/trunk

Proposed by Mario Guerriero
Status: Merged
Merged at revision: 823
Proposed branch: lp:~mefrio-g/pantheon-files/fix-1005013
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 36 lines (+7/-2)
1 file modified
src/View/Chrome/ViewSwicher.vala (+7/-2)
To merge this branch: bzr merge lp:~mefrio-g/pantheon-files/fix-1005013
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+107555@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/View/Chrome/ViewSwicher.vala'
2--- src/View/Chrome/ViewSwicher.vala 2012-05-12 14:05:55 +0000
3+++ src/View/Chrome/ViewSwicher.vala 2012-05-27 14:18:19 +0000
4@@ -35,25 +35,30 @@
5 //private ViewMode mode{
6 set{
7 Widget target;
8-
9+ int active_index;
10+
11 switch (value) {
12 case ViewMode.LIST:
13 target = list;
14+ active_index = 1;
15 break;
16 case ViewMode.COMPACT:
17 target = compact;
18+ active_index = 2;
19 break;
20 case ViewMode.MILLER:
21 target = miller;
22+ active_index = 3;
23 break;
24 default:
25 target = icon;
26+ active_index = 0;
27 break;
28 }
29
30 Preferences.settings.set_enum ("default-viewmode", value);
31 //switcher.focus(target);
32- //switcher.set_active_widget (target);
33+ switcher.set_active (active_index);
34 _mode = mode;
35 }
36 private get{

Subscribers

People subscribed via source and target branches

to all changes: