[gnumeric] GUI: make sure auto expression doens't grow vertically
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] GUI: make sure auto expression doens't grow vertically
- Date: Wed, 4 Jan 2012 00:51:34 +0000 (UTC)
commit 34c7c41722a269aa7b225f9dc0a0ea362b0b549c
Author: Morten Welinder <terra gnome org>
Date: Tue Jan 3 19:51:03 2012 -0500
GUI: make sure auto expression doens't grow vertically
ChangeLog | 4 ++++
src/wbc-gtk.c | 14 ++++++++------
2 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fe080b7..6105d25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-01-03 Morten Welinder <terra gnome org>
+ * src/wbc-gtk.c (wbc_gtk_create_status_area): Add magic to ensure
+ the auto-expression label doesn't grow, even if something else
+ makes the status line grow taller. Fixes #667094.
+
* src/cell-draw.c (cell_draw): Fix problems with underlines and
rotated cells. [#667152]
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 56cc64d..bc45e67 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -4751,7 +4751,7 @@ cb_select_auto_expr (GtkWidget *widget, GdkEventButton *event, WBCGtk *wbcg)
static void
wbc_gtk_create_status_area (WBCGtk *wbcg)
{
- GtkWidget *tmp, *frame;
+ GtkWidget *tmp, *frame, *align, *ebox;
GdkRGBA const white = {1.,1.,1.,1.};
const char *auto_expr_sample = "Sumerage = -012345678901234";
@@ -4770,15 +4770,17 @@ wbc_gtk_create_status_area (WBCGtk *wbcg)
gtk_widget_get_pango_context (GTK_WIDGET (wbcg->toplevel)),
gtk_style_context_get_font (gtk_widget_get_style_context (tmp), GTK_STATE_NORMAL),
auto_expr_sample), -1);
- tmp = gtk_event_box_new ();
- gtk_container_add (GTK_CONTAINER (tmp), wbcg->auto_expr_label);
- g_signal_connect (G_OBJECT (tmp),
+ align = gtk_alignment_new (0.5, 0.5, 0, 0);
+ gtk_container_add (GTK_CONTAINER (align), wbcg->auto_expr_label);
+ ebox = gtk_event_box_new ();
+ g_signal_connect (G_OBJECT (ebox),
"button_press_event",
G_CALLBACK (cb_select_auto_expr), wbcg);
+ gtk_container_add (GTK_CONTAINER (ebox), align);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
- gtk_container_add (GTK_CONTAINER (frame), tmp);
- gtk_widget_override_background_color (GTK_WIDGET (tmp),
+ gtk_container_add (GTK_CONTAINER (frame), ebox);
+ gtk_widget_override_background_color (GTK_WIDGET (ebox),
GTK_STATE_FLAG_NORMAL,
&white);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]