Merge lp:~elementary-apps/pantheon-photos/no-expanders into lp:~pantheon-photos/pantheon-photos/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: Felipe Escoto
Approved revision: 3044
Merged at revision: 3044
Proposed branch: lp:~elementary-apps/pantheon-photos/no-expanders
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 41 lines (+4/-12)
1 file modified
src/sidebar/metadata/MetadataSidebar.vala (+4/-12)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-photos/no-expanders
Reviewer Review Type Date Requested Status
Photos Devs Pending
Review via email: mp+310152@code.launchpad.net

Commit message

MetadataSidebar.vala: Remove the expanders

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/sidebar/metadata/MetadataSidebar.vala'
2--- src/sidebar/metadata/MetadataSidebar.vala 2016-11-06 18:21:29 +0000
3+++ src/sidebar/metadata/MetadataSidebar.vala 2016-11-06 23:03:36 +0000
4@@ -43,7 +43,8 @@
5 properties_collection.append (new ExtendedProperties ());
6
7 foreach (var properties in properties_collection) {
8- add_expander (properties);
9+ grid.attach (properties, 0, line_count, 1, 1);
10+ line_count++;
11 }
12
13 collection_page_properties = new BasicProperties ();
14@@ -59,16 +60,6 @@
15 add (stack);
16 }
17
18- private void add_expander (Properties properties) {
19- var expander = new Gtk.Expander ("<b>" + properties.get_header_title () + "</b>");
20- expander.use_markup = true;
21- expander.add (properties);
22- expander.set_spacing (10);
23- grid.attach (expander, 0, line_count, 1, 1);
24- line_count++;
25- expander.set_expanded (true);
26- }
27-
28 public void update_properties (Page page) {
29 /* figure out if we have a single image selected */
30 ViewCollection view = page.get_view ();
31@@ -111,8 +102,9 @@
32 collection_page_properties.update_properties (page);
33 stack.visible_child = collection_page_properties;
34 } else {
35- foreach (var properties in properties_collection)
36+ foreach (var properties in properties_collection) {
37 properties.update_properties (page);
38+ }
39 stack.visible_child = grid;
40 }
41 }

Subscribers

People subscribed via source and target branches