Merge lp:~l-admin-3/scratch/dialog-margins into lp:~elementary-apps/scratch/scratch

Proposed by Marcus Wichelmann
Status: Merged
Approved by: Danielle Foré
Approved revision: 1445
Merged at revision: 1445
Proposed branch: lp:~l-admin-3/scratch/dialog-margins
Merge into: lp:~elementary-apps/scratch/scratch
Diff against target: 28 lines (+2/-6)
1 file modified
src/Dialogs/PreferencesDialog.vala (+2/-6)
To merge this branch: bzr merge lp:~l-admin-3/scratch/dialog-margins
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+246775@code.launchpad.net

Commit message

Fixes the margins of a Gtk.Dialog in Gtk+-3.14.

Description of the change

Fixes the margins of a Gtk.Dialog in Gtk+-3.14.

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/Dialogs/PreferencesDialog.vala'
2--- src/Dialogs/PreferencesDialog.vala 2014-10-02 22:26:10 +0000
3+++ src/Dialogs/PreferencesDialog.vala 2015-01-16 20:16:22 +0000
4@@ -45,16 +45,12 @@
5 FontButton select_font;
6
7 public Preferences (Gtk.Window? parent, PluginsManager plugins) {
8- Object (use_header_bar: 1);
9-
10 if (parent != null)
11 set_transient_for (parent);
12 title = _("Preferences");
13 set_default_size (630, 330);
14 resizable = false;
15-
16- (get_header_bar () as Gtk.HeaderBar).show_close_button = false;
17- get_header_bar ().get_style_context ().remove_class ("header-bar");
18+ deletable = false;
19
20 main_stack = new Gtk.Stack ();
21 main_stackswitcher = new Gtk.StackSwitcher ();
22@@ -290,4 +286,4 @@
23 }
24 }
25 }
26-} // Namespace
27\ No newline at end of file
28+} // Namespace

Subscribers

People subscribed via source and target branches