From 7546cb47acd780bdcbff4749c5bb5ff5ec50220f Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 8 Jul 2010 21:42:59 +0200 Subject: [PATCH] Movie list view: update style, get color from parent window style --- src/movie-list-view.vala | 22 ++++++++++------------ src/movie-list-window.vala | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/movie-list-view.vala b/src/movie-list-view.vala index b99b6aa..e0d1ad3 100644 --- a/src/movie-list-view.vala +++ b/src/movie-list-view.vala @@ -26,7 +26,7 @@ public class MovieListView : PannableArea { public signal void movie_activated (Movie movie); - construct { + public MovieListView (Gtk.Window window) { store = new MovieListStore (); // Add filter wrapper @@ -66,31 +66,29 @@ public class MovieListView : PannableArea { var vbox_renderer = new CellRendererVBox (); var renderer = new CellRendererText (); - renderer.set ("ellipsize", Pango.EllipsizeMode.END); - title_column.add_attribute (renderer, "text", MovieListStore.Columns.TITLE); + renderer.yalign = 1.0f; + renderer.ellipsize = Pango.EllipsizeMode.END; vbox_renderer.append (renderer, true); vbox_renderer.set_data ("title", renderer); // Add secondary text to column (Genres, Director, etc.) renderer = new CellRendererText (); - renderer.set ("ellipsize", Pango.EllipsizeMode.END); + renderer.yalign = 0; + renderer.ellipsize = Pango.EllipsizeMode.END; Pango.AttrList attr_list = new Pango.AttrList (); - var style = Gtk.rc_get_style_by_paths (this.get_settings (), "SmallSystemFont", null, typeof (void)); + var style = Gtk.rc_get_style_by_paths (Gtk.Settings.get_default (), "SmallSystemFont", null, typeof (void)); if (style != null) { var attr_font_desc = new Pango.AttrFontDesc (style.font_desc.copy ()); attr_list.insert ((owned) attr_font_desc); - } else { - Pango.Attribute attr_font_scale = Pango.attr_scale_new (Pango.Scale.SMALL); - attr_list.insert ((owned) attr_font_scale); } Gdk.Color color; - if (!style.lookup_color ("SecondaryTextColor", out color)) { - Gdk.Color.parse ("grey", out color); + window.ensure_style (); + if (window.style.lookup_color ("SecondaryTextColor", out color)) { + Pango.Attribute attr_color = Pango.attr_foreground_new (color.red, color.green, color.blue); + attr_list.insert ((owned) attr_color); } - Pango.Attribute attr_color = Pango.attr_foreground_new (color.red, color.green, color.blue); - attr_list.insert ((owned) attr_color); renderer.attributes = attr_list; vbox_renderer.append (renderer, true); diff --git a/src/movie-list-window.vala b/src/movie-list-window.vala index 991bd5e..5839e34 100644 --- a/src/movie-list-window.vala +++ b/src/movie-list-window.vala @@ -64,7 +64,7 @@ public class MovieListWindow : StackableWindow { add_toolbar (search_bar); // Movie list - connected to menu for sorting - movie_list = new MovieListView (); + movie_list = new MovieListView (this); menu.sortable = movie_list.sorted_store; store = movie_list.store; store.source = source; -- 1.7.9.5