Merge lp:~madsa/pantheon-files/fix-1033080 into lp:~elementary-apps/pantheon-files/trunk

Proposed by Matt Spaulding
Status: Merged
Approved by: Cody Garver
Approved revision: 2330
Merged at revision: 2333
Proposed branch: lp:~madsa/pantheon-files/fix-1033080
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 23 lines (+5/-4)
1 file modified
src/View/Window.vala (+5/-4)
To merge this branch: bzr merge lp:~madsa/pantheon-files/fix-1033080
Reviewer Review Type Date Requested Status
Jeremy Wootten code, ui and function Approve
Review via email: mp+306716@code.launchpad.net

Commit message

Adjust placement of the Set as Default bar

Description of the change

Fixes set as default bar is too wide.

To post a comment you must log in.
Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

Thanks for the contribution Matt.

This has the required effect.

review: Approve (code, ui and function)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/View/Window.vala'
2--- src/View/Window.vala 2016-09-15 11:52:44 +0000
3+++ src/View/Window.vala 2016-09-25 21:07:08 +0000
4@@ -127,14 +127,15 @@
5 /* Only show side bar in first window - (to be confirmed) */
6
7 lside_pane.pack1 (sidebar, false, false);
8- lside_pane.pack2 (tabs, true, false);
9
10 Gtk.Box window_box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
11 window_box.show();
12 window_box.pack_start(info_bar, false, false, 0);
13- window_box.pack_start(lside_pane, true, true, 0);
14-
15- add(window_box);
16+ window_box.pack_start(tabs, true, true, 0);
17+
18+ lside_pane.pack2 (window_box, true, false);
19+
20+ add(lside_pane);
21
22 title = _(Marlin.APP_TITLE);
23 try {

Subscribers

People subscribed via source and target branches

to all changes: