IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Gtk3: fix failing item-edit widget on sheets

Browse Source 
There were several problems since the conversion to gtk3
* widget wasn't displayed at all - apparently this was because I had overriden the draw function of the gtklayout (sheet)
  -> fixed by adding a draw callback instead
* several gtk warnings about allocating sizes to widgets without using *get_preferred_width/height
  -> fixed by adding the itemedit dropdowns to the layout only when they are requested
* the arrow button didn't want to resize small enough
  -> fixed by adding a custom style to drops the button's internal padding
* there were several sizing issues which ironically got fixed dropping much of the custom sizing code
This commit is contained in:
Geert Janssens 2017-04-14 15:28:45 +02:00
parent 24ed305c18
commit dd9b2007b0
4 changed files with 95 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/register/register-gnome/combocell-gnome.c
View File

@ -757,8 +757,6 @@ gnc_combo_cell_gui_realize (BasicCell *bcell, gpointer data)
else
box->item_list = GNC_ITEM_LIST (gnc_item_list_new (box->tmp_store));
gtk_widget_show_all (GTK_WIDGET(box->item_list));
gtk_layout_put (GTK_LAYOUT(sheet),
GTK_WIDGET(box->item_list), 0, 0);
g_object_ref_sink(box->item_list);
/* to mark cell as realized, remove the realize method */

2
src/register/register-gnome/datecell-gnome.c
View File

@ -609,8 +609,6 @@ gnc_date_cell_realize (BasicCell *bcell, gpointer data)
box->item_edit = item_edit;
box->date_picker = GNC_DATE_PICKER (gnc_date_picker_new ());
gtk_widget_show_all (GTK_WIDGET(box->date_picker));
gtk_layout_put (GTK_LAYOUT(sheet),
GTK_WIDGET(box->date_picker), 0, 0);
g_object_ref_sink(box->date_picker);
/* to mark cell as realized, remove the realize method */

198
src/register/register-gnome/gnucash-item-edit.c
View File

@ -59,9 +59,6 @@ enum
static GtkBoxClass *gnc_item_edit_parent_class;
static void gnc_item_edit_show_popup_toggle (GncItemEdit *item_edit,
gint width, gint height);
/*
* Returns the coordinates for the editor bounding box
*/
@ -102,40 +99,19 @@ gnc_item_edit_get_toggle_offset (int row_height)
static void
gnc_item_edit_update (GncItemEdit *item_edit)
{
GtkRequisition cur_req;
gint toggle_width, toggle_height;
gint x, y, w, h, cur_x, cur_y;
gint x, y, w, h;
gnc_item_edit_get_pixel_coords (item_edit, &x, &y, &w, &h);
gtk_layout_move (GTK_LAYOUT(item_edit->sheet),
GTK_WIDGET(item_edit), x, y);
gtk_widget_queue_resize (GTK_WIDGET (item_edit));
gtk_container_child_get(GTK_CONTAINER(item_edit->sheet),
GTK_WIDGET(item_edit),
"x", &cur_x, "y", &cur_y, NULL);
if ((cur_x != x) || (cur_y != y))
gtk_layout_move (GTK_LAYOUT(item_edit->sheet),
GTK_WIDGET(item_edit), x, y);
toggle_height = h - (2 * (CELL_VPADDING + 1));
toggle_width = toggle_height;
if (item_edit->is_popup)
w -= toggle_width;
gtk_widget_get_requisition(GTK_WIDGET(item_edit), &cur_req);
if ((cur_req.height != h) || (cur_req.width != w))
gtk_widget_set_size_request(GTK_WIDGET(item_edit), w, h);
gtk_widget_get_requisition(item_edit->editor, &cur_req);
if ((cur_req.height != h) || (cur_req.width != w))
gtk_widget_set_size_request(item_edit->editor, -1, h);
if (!item_edit->is_popup)
return;
gnc_item_edit_show_popup_toggle (item_edit, toggle_width, toggle_height);
if (item_edit->show_popup)
gnc_item_edit_show_popup (item_edit);
if (item_edit->is_popup)
{
gtk_widget_show (item_edit->popup_toggle.ebox);
if (item_edit->show_popup)
gnc_item_edit_show_popup (item_edit);
}
}
void
@ -202,6 +178,7 @@ gnc_item_edit_configure (GncItemEdit *item_edit)
{
GnucashSheet *sheet = item_edit->sheet;
GnucashCursor *cursor;
gfloat xalign;
cursor = GNUCASH_CURSOR(sheet->cursor);
@ -209,13 +186,30 @@ gnc_item_edit_configure (GncItemEdit *item_edit)
item_edit->virt_loc.vcell_loc.virt_col = cursor->col;
item_edit->style =
gnucash_sheet_get_style (item_edit->sheet,
gnucash_sheet_get_style (sheet,
item_edit->virt_loc.vcell_loc);
item_edit->virt_loc.phys_row_offset = cursor->cell.row;
item_edit->virt_loc.phys_col_offset = cursor->cell.col;
if (!gnc_table_is_popup (item_edit->sheet->table, item_edit->virt_loc))
switch (gnc_table_get_align (sheet->table, item_edit->virt_loc))
{
default:
case CELL_ALIGN_LEFT:
xalign = 0;
break;
case CELL_ALIGN_RIGHT:
xalign = 1;
break;
case CELL_ALIGN_CENTER:
xalign = 0.5;
break;
}
gtk_entry_set_alignment(GTK_ENTRY(item_edit->editor), xalign);
if (!gnc_table_is_popup (sheet->table, item_edit->virt_loc))
gnc_item_edit_set_popup (item_edit, NULL, NULL, NULL,
NULL, NULL, NULL, NULL);
@ -246,68 +240,6 @@ gnc_item_edit_paste_clipboard (GncItemEdit *item_edit)
}
static void
gnc_item_edit_show_popup_toggle (GncItemEdit *item_edit,
gint width, gint height)
{
GtkRequisition cur_req;
GList *children, *iter;
GtkWidget *toggle;
gboolean is_child = FALSE;
g_return_if_fail (GNC_IS_ITEM_EDIT (item_edit));
toggle = item_edit->popup_toggle.ebox;
gtk_widget_get_requisition(toggle, &cur_req);
children = gtk_container_get_children (GTK_CONTAINER(item_edit));
for (iter = children; iter; iter = iter->next)
{
GtkWidget *child = iter->data;
if (child == toggle)
{
is_child = TRUE;
break;
}
}
g_list_free (children);
if (!is_child)
gtk_box_pack_start(GTK_BOX(item_edit), toggle, FALSE, TRUE, 0);
else if ((cur_req.height != height) ||
(cur_req.width != width))
{
gtk_widget_set_size_request(toggle, width, height);
gtk_container_resize_children(GTK_CONTAINER(item_edit));
}
}
static void
gnc_item_edit_hide_popup_toggle (GncItemEdit *item_edit)
{
GList *children, *iter;
gboolean is_child = FALSE;
g_return_if_fail (GNC_IS_ITEM_EDIT(item_edit));
children = gtk_container_get_children (GTK_CONTAINER(item_edit));
for (iter = children; iter; iter = iter->next)
{
GtkWidget *child = iter->data;
if (child == item_edit->popup_toggle.ebox)
{
is_child = TRUE;
break;
}
}
g_list_free (children);
if (is_child)
gtk_container_remove (GTK_CONTAINER(item_edit),
item_edit->popup_toggle.ebox);
}
static gboolean
key_press_popup_cb (GtkWidget *widget, GdkEventKey *event, gpointer data)
{
@ -474,6 +406,26 @@ gnc_item_edit_set_property (GObject *object,
}
}
static void
gnc_item_edit_get_preferred_width (GtkWidget *widget,
gint *minimal_width,
gint *natural_width)
{
gint x, y, w, h;
gnc_item_edit_get_pixel_coords (GNC_ITEM_EDIT (widget), &x, &y, &w, &h);
*minimal_width = *natural_width = w + 1;
}
static void
gnc_item_edit_get_preferred_height (GtkWidget *widget,
gint *minimal_width,
gint *natural_width)
{
gint x, y, w, h;
gnc_item_edit_get_pixel_coords (GNC_ITEM_EDIT (widget), &x, &y, &w, &h);
*minimal_width = *natural_width = h + 1;
}
/*
* GncItemEdit class initialization
@ -501,6 +453,8 @@ gnc_item_edit_class_init (GncItemEditClass *gnc_item_edit_class)
G_PARAM_READWRITE));
/* GtkWidget method overrides */
widget_class->get_preferred_width = gnc_item_edit_get_preferred_width;
widget_class->get_preferred_height = gnc_item_edit_get_preferred_height;
}
@ -538,6 +492,9 @@ gnc_item_edit_get_type (void)
GtkWidget *
gnc_item_edit_new (GnucashSheet *sheet)
{
char *hpad_str, *vpad_str, *entry_css;
GtkStyleContext *stylecontext;
GtkCssProvider *provider;
GncItemEdit *item_edit =
g_object_new (GNC_TYPE_ITEM_EDIT,
"sheet", sheet,
@ -545,19 +502,31 @@ gnc_item_edit_new (GnucashSheet *sheet)
"homogeneous", FALSE,
NULL);
gtk_layout_put (GTK_LAYOUT(sheet), GTK_WIDGET(item_edit), 0, 0);
gtk_container_set_reallocate_redraws (GTK_CONTAINER(item_edit), TRUE);
/* Create the text entry */
item_edit->editor = gtk_entry_new();
sheet->entry = item_edit->editor;
gtk_entry_set_width_chars (GTK_ENTRY(item_edit->editor), 1);
gtk_box_pack_start (GTK_BOX(item_edit), item_edit->editor, TRUE, TRUE, 0);
/* Force padding on the entry to align with the rest of the register */
hpad_str = g_strdup_printf("%i", CELL_HPADDING);
vpad_str = g_strdup_printf("%i", CELL_VPADDING);
entry_css = g_strconcat ("* { padding: ", vpad_str, "px ", hpad_str, "px ", vpad_str, "px ", hpad_str, "px }", NULL);
provider = gtk_css_provider_new();
gtk_css_provider_load_from_data (provider, entry_css, -1, NULL);
stylecontext = gtk_widget_get_style_context (item_edit->editor);
gtk_style_context_add_provider (stylecontext, GTK_STYLE_PROVIDER (provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_free (hpad_str);
g_free (vpad_str);
g_free (entry_css);
/* Create the popup button
It will only be displayed when the cell being edited provides
a popup item (like a calendar or account list) */
item_edit->popup_toggle.arrow = GTK_ARROW(gtk_arrow_new(GTK_ARROW_DOWN,
GTK_SHADOW_IN));
gtk_misc_set_alignment(GTK_MISC(item_edit->popup_toggle.arrow), 0.5, 0.5);
item_edit->popup_toggle.tbutton = gtk_toggle_button_new();
gtk_toggle_button_set_mode (
@ -565,16 +534,25 @@ gnc_item_edit_new (GnucashSheet *sheet)
gtk_container_add(GTK_CONTAINER(item_edit->popup_toggle.tbutton),
GTK_WIDGET(item_edit->popup_toggle.arrow));
/* Force padding on the button to
1. keep it small
2. display as much as possible of the arrow */
provider = gtk_css_provider_new();
gtk_css_provider_load_from_data (provider, "* { padding: 1px }", -1, NULL);
stylecontext = gtk_widget_get_style_context (item_edit->popup_toggle.tbutton);
gtk_style_context_add_provider (stylecontext, GTK_STYLE_PROVIDER (provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
/* Wrap the popup button in an event box to give it its own gdkwindow.
* Without one the button would disappear behind the grid object. */
item_edit->popup_toggle.ebox = gtk_event_box_new();
g_object_ref(item_edit->popup_toggle.ebox);
gtk_container_add(GTK_CONTAINER(item_edit->popup_toggle.ebox),
GTK_WIDGET(item_edit->popup_toggle.tbutton));
item_edit->popup_toggle.tbutton);
gtk_box_pack_start (GTK_BOX(item_edit),
GTK_WIDGET(item_edit->popup_toggle.ebox),
FALSE, TRUE, 0);
item_edit->popup_toggle.ebox,
FALSE, TRUE, 0);
gtk_widget_show_all(GTK_WIDGET(item_edit));
return GTK_WIDGET(item_edit);
@ -646,10 +624,10 @@ gnc_item_edit_show_popup (GncItemEdit *item_edit)
else
popup_w = -1;
gtk_layout_move (GTK_LAYOUT(sheet), item_edit->popup_item,
popup_x, popup_y);
if (!gtk_widget_get_parent (item_edit->popup_item))
gtk_layout_put (GTK_LAYOUT(sheet), item_edit->popup_item,
popup_x, popup_y);
gtk_widget_set_size_request(item_edit->popup_item, popup_w, popup_h);
gtk_widget_show_all (item_edit->popup_item);
// FIXME what about the GtkAnchorType that the GNOME_CANVAS_ITEM used ?
toggle = GTK_TOGGLE_BUTTON(item_edit->popup_toggle.tbutton);
@ -700,8 +678,7 @@ gnc_item_edit_hide_popup (GncItemEdit *item_edit)
if (!item_edit->is_popup)
return;
gtk_widget_hide (item_edit->popup_item);
gtk_container_remove (GTK_CONTAINER(item_edit->sheet), item_edit->popup_item);
gtk_arrow_set (item_edit->popup_toggle.arrow,
GTK_ARROW_DOWN, GTK_SHADOW_IN);
@ -743,11 +720,8 @@ gnc_item_edit_set_popup (GncItemEdit *item_edit,
disconnect_popup_toggle_signals (item_edit);
gnc_item_edit_hide_popup (item_edit);
gnc_item_edit_hide_popup_toggle (item_edit);
gtk_widget_hide (item_edit->popup_toggle.ebox);
}
if (gtk_widget_get_realized(GTK_WIDGET(item_edit)))
gnc_item_edit_update (item_edit);
}
gboolean

17
src/register/register-gnome/gnucash-sheet.c
View File

@ -97,6 +97,8 @@ static gboolean gnucash_sheet_delete_surrounding_cb (GtkIMContext *context,
GnucashSheet *sheet);
static gboolean gnucash_sheet_check_direct_update_cell(GnucashSheet *sheet,
const VirtualLocation virt_loc);
gboolean gnucash_sheet_draw_cb (GtkWidget *widget, cairo_t *cr,
G_GNUC_UNUSED gpointer data);
/** Implementation *****************************************************/
@ -692,6 +694,8 @@ gnucash_sheet_create (Table *table)
g_signal_connect (G_OBJECT (sheet->vadj), "value_changed",
G_CALLBACK (gnucash_sheet_vadjustment_value_changed), sheet);
g_signal_connect (G_OBJECT (sheet), "draw",
G_CALLBACK (gnucash_sheet_draw_cb), sheet);
LEAVE("%p", sheet);
return sheet;
@ -1046,20 +1050,20 @@ gnucash_sheet_delete_cb (GtkWidget *widget,
g_string_free (new_text_gs, TRUE);
}
static gboolean
gnucash_sheet_draw (GtkWidget *widget, cairo_t *cr)
gboolean
gnucash_sheet_draw_cb (GtkWidget *widget, cairo_t *cr, G_GNUC_UNUSED gpointer data)
{
GnucashSheet *sheet = GNUCASH_SHEET (widget);
GtkStyleContext *context = gtk_widget_get_style_context (widget);
GtkAllocation alloc;
gboolean result;
gtk_widget_get_allocation(widget, &alloc);
cairo_save (cr);
gtk_render_background (context, cr, alloc.x, alloc.y, alloc.width, alloc.height);
result = gnucash_sheet_draw_internal (sheet, cr, &alloc);
gnucash_sheet_draw_cursor (sheet->cursor, cr);
cairo_restore (cr);
return result;
return FALSE;
}
@ -2457,9 +2461,6 @@ gnucash_sheet_class_init (GnucashSheetClass *klass)
widget_class->button_press_event = gnucash_button_press_event;
widget_class->button_release_event = gnucash_button_release_event;
widget_class->scroll_event = gnucash_scroll_event;
widget_class->draw = gnucash_sheet_draw;
}