[five-or-more/headerbar: 5/5] Attempt to move preview area into the headerbar
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [five-or-more/headerbar: 5/5] Attempt to move preview area into the headerbar
- Date: Mon, 25 Nov 2013 04:42:35 +0000 (UTC)
commit 7f6ff668cf7cd6086615ea5159a11c76c1e50c54
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sun Nov 24 22:20:41 2013 -0600
Attempt to move preview area into the headerbar
It's broken :(
data/five-or-more.ui | 47 +++++++++++++++++------------------------------
src/glines.c | 6 +++---
2 files changed, 20 insertions(+), 33 deletions(-)
---
diff --git a/data/five-or-more.ui b/data/five-or-more.ui
index c379201..34634e6 100644
--- a/data/five-or-more.ui
+++ b/data/five-or-more.ui
@@ -17,6 +17,23 @@
<property name="show_close_button">True</property>
<property name="title" translatable="yes">Five or More</property>
<child>
+ <object class="GtkLabel" id="labelNext">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">6</property>
+ <property name="label" translatable="yes">Next:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="top_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
<object class="GtkLabel" id="labelScore">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -51,36 +68,6 @@
<placeholder/>
</child>
<child>
- <object class="GtkBox" id="top_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="labelNext">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">6</property>
- <property name="label" translatable="yes">Next:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<placeholder/>
</child>
</object>
diff --git a/src/glines.c b/src/glines.c
index 0b1aea2..423fed1 100644
--- a/src/glines.c
+++ b/src/glines.c
@@ -279,12 +279,12 @@ refresh_preview_surfaces (void)
GdkPixbuf *scaled = NULL;
GtkWidget *widget = preview_widgets[0];
GtkStyleContext *context;
- GdkRGBA bg;
+ GdkRGBA bg = {0.0, 0.0, 0.0, 1.0};
cairo_t *cr;
GdkRectangle preview_rect;
- context = gtk_widget_get_style_context (widget);
- gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
+// context = gtk_widget_get_style_context (widget);
+// gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
/* Like the refresh_pixmaps() function, we may be called before
* the window is ready. */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]