Terminal

Merge lp:~elementary-apps/pantheon-terminal/style-classes into lp:~elementary-apps/pantheon-terminal/trunk

  1. style-classes
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Cody Garver
Approved revision: 790
Merged at revision: 791
Proposed branch: lp:~elementary-apps/pantheon-terminal/style-classes
Merge into: lp:~elementary-apps/pantheon-terminal/trunk
Diff against target: 19 lines (+2/-2)
1 file modified
src/PantheonTerminalWindow.vala (+2/-2)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-terminal/style-classes
Reviewer Review Type Date Requested Status
David Gomes (community) Approve
Review via email: mp+279836@code.launchpad.net

Commit message

* Add "compact" class to headerbar instead of removing "header-bar"
* Use Gtk.STYLE_CLASS_FLAT constant instead of "flat"

Description of the change

This is meant to fix an issue that comes from Gtk 3.19. There is no longer a "header-bar" class. So instead of removing a class, we need to add a new class.

To post a comment you must log in.
lp:~elementary-apps/pantheon-terminal/style-classes updated
790. By Danielle Foré

don't remove non-existant class

Revision history for this message
David Gomes (davidgomes) :
review: Approve
Revision history for this message
David Gomes (davidgomes) wrote :

Not merging yet because it hasn't been tested, Approved because the code looks fine.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/PantheonTerminalWindow.vala'
2--- src/PantheonTerminalWindow.vala 2015-11-24 06:50:07 +0000
3+++ src/PantheonTerminalWindow.vala 2015-12-07 23:57:31 +0000
4@@ -161,14 +161,14 @@
5 /* Use CSD */
6 var header = new Gtk.HeaderBar ();
7 header.set_show_close_button (true);
8- header.get_style_context ().remove_class ("header-bar");
9+ header.get_style_context ().add_class ("compact");
10
11 this.set_titlebar (header);
12
13 search_button = new Gtk.ToggleButton ();
14 var img = new Gtk.Image.from_icon_name ("edit-find-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
15 search_button.set_image (img);
16- search_button.get_style_context ().add_class ("flat");
17+ search_button.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
18 search_button.set_tooltip_text (_("Find…"));
19 header.pack_end (search_button);
20

Subscribers

People subscribed via source and target branches