X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-view.c;h=ce29472e87095ee6f562b510f133ac5c8a8ee6e3;hb=403493b1f40ad45303df55ffbc27d08b1d9a8623;hp=e4617e766fde9b31fc8539e2b9654b66b2013574;hpb=6648c65e4574357f2f3b8d97ccd92ef0e77ad657;p=pspp diff --git a/src/ui/gui/psppire-output-view.c b/src/ui/gui/psppire-output-view.c index e4617e766f..ce29472e87 100644 --- a/src/ui/gui/psppire-output-view.c +++ b/src/ui/gui/psppire-output-view.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008-2015 Free Software Foundation. + Copyright (C) 2008-2015, 2016 Free Software Foundation. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -160,6 +160,18 @@ create_xr (struct psppire_output_view *view) cairo_destroy (cr); } +/* Return the horizontal position to place a widget whose + width is CHILD_WIDTH */ +static gint +get_xpos (const struct psppire_output_view *view, gint child_width) +{ + GdkWindow *gdkw = gtk_widget_get_window (GTK_WIDGET (view->output)); + guint w = gdk_window_get_width (gdkw); + int gutter = 0; + g_object_get (view->output, "border-width", &gutter, NULL); + return (gtk_widget_get_direction (GTK_WIDGET (view->output)) == GTK_TEXT_DIR_RTL) ? w - child_width - gutter: gutter; +} + static void create_drawing_area (struct psppire_output_view *view, GtkWidget *drawing_area, struct xr_rendering *r, @@ -170,7 +182,8 @@ create_drawing_area (struct psppire_output_view *view, if (0) { GdkRGBA green = {0, 1, 0, 1}; - gtk_widget_override_background_color (view->output, GTK_STATE_NORMAL, &green); + gtk_widget_override_background_color (GTK_WIDGET (view->output), + GTK_STATE_NORMAL, &green); GdkRGBA red = {1, 0, 0, 1}; gtk_widget_override_background_color (drawing_area, GTK_STATE_NORMAL, &red); } @@ -182,7 +195,9 @@ create_drawing_area (struct psppire_output_view *view, G_CALLBACK (draw_callback), view); gtk_widget_set_size_request (drawing_area, tw, th); - gtk_layout_put (view->output, drawing_area, 0, view->y); + gint xpos = get_xpos (view, tw); + + gtk_layout_put (view->output, drawing_area, xpos, view->y); gtk_widget_show (drawing_area); } @@ -220,9 +235,7 @@ rerender (struct psppire_output_view *view) xr_rendering_measure (r, &tw, &th); - guint w = gdk_window_get_width (gdkw); - gint xpos = (gtk_widget_get_direction (GTK_WIDGET (view->output)) == - GTK_TEXT_DIR_RTL) ? w - tw : 0; + gint xpos = get_xpos (view, tw); if (!item->drawing_area) { @@ -237,11 +250,23 @@ rerender (struct psppire_output_view *view) gtk_layout_move (view->output, item->drawing_area, xpos, view->y); } + { + gint minw; + gint minh; + /* This code probably doesn't bring us anthing, but Gtk + shows warnings if get_preferred_width/height is not + called before the size_allocate below is called. */ + gtk_widget_get_preferred_width (item->drawing_area, &minw, NULL); + gtk_widget_get_preferred_height (item->drawing_area, &minh, NULL); + if (th > minh) th = minh; + if (tw > minw) tw = minw; + } alloc.x = xpos; alloc.y = view->y; alloc.width = tw; alloc.height = th; - gtk_widget_size_allocate(item->drawing_area,&alloc); + + gtk_widget_size_allocate (item->drawing_area, &alloc); if (view->max_width < tw) view->max_width = tw; @@ -576,10 +601,12 @@ on_copy (struct psppire_output_view *view) } static void -on_selection_change (GtkTreeSelection *sel, GtkAction *copy_action) +on_selection_change (GtkTreeSelection *sel, GAction *copy_action) { /* The Copy action is available only if there is something selected */ - gtk_action_set_sensitive (copy_action, gtk_tree_selection_count_selected_rows (sel) > 0); + g_object_set (copy_action, + "enabled", gtk_tree_selection_count_selected_rows (sel) > 0, + NULL); } static void @@ -604,16 +631,41 @@ on_size_allocate (GtkWidget *widget, } } +static void +on_realize (GtkWidget *overview, GObject *view) +{ + GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (overview)); + gtk_tree_selection_set_mode (sel, GTK_SELECTION_MULTIPLE); + + GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (overview)); + + GAction *copy_action = g_action_map_lookup_action (G_ACTION_MAP (toplevel), + "copy"); + + GAction *select_all_action = g_action_map_lookup_action (G_ACTION_MAP (toplevel), + "select-all"); + + g_object_set (copy_action, "enabled", FALSE, NULL); + + g_signal_connect_swapped (select_all_action, "activate", + G_CALLBACK (on_select_all), view); + + g_signal_connect_swapped (copy_action, "activate", + G_CALLBACK (on_copy), view); + + g_signal_connect (sel, "changed", G_CALLBACK (on_selection_change), + copy_action); +} + struct psppire_output_view * -psppire_output_view_new (GtkLayout *output, GtkTreeView *overview, - GtkAction *copy_action, GtkAction *select_all_action) +psppire_output_view_new (GtkLayout *output, GtkTreeView *overview) { struct psppire_output_view *view; GtkTreeViewColumn *column; GtkCellRenderer *renderer; - GtkTreeSelection *sel; - GtkTreeModel *model; + GtkTreeModel *model; + view = xmalloc (sizeof *view); view->xr = NULL; view->font_height = 0; @@ -643,6 +695,8 @@ psppire_output_view_new (GtkLayout *output, GtkTreeView *overview, if (overview) { + g_signal_connect (overview, "realize", G_CALLBACK (on_realize), view); + model = GTK_TREE_MODEL (gtk_tree_store_new ( N_COLS, G_TYPE_STRING, /* COL_NAME */ @@ -651,11 +705,6 @@ psppire_output_view_new (GtkLayout *output, GtkTreeView *overview, gtk_tree_view_set_model (overview, model); g_object_unref (model); - sel = gtk_tree_view_get_selection (overview); - gtk_tree_selection_set_mode (sel, GTK_SELECTION_MULTIPLE); - g_signal_connect (sel, "changed", G_CALLBACK (on_selection_change), - copy_action); - column = gtk_tree_view_column_new (); gtk_tree_view_append_column (GTK_TREE_VIEW (overview), column); renderer = gtk_cell_renderer_text_new (); @@ -664,12 +713,6 @@ psppire_output_view_new (GtkLayout *output, GtkTreeView *overview, g_signal_connect (GTK_TREE_VIEW (overview), "row-activated", G_CALLBACK (on_row_activate), view); - - gtk_action_set_sensitive (copy_action, FALSE); - g_signal_connect_swapped (copy_action, "activate", - G_CALLBACK (on_copy), view); - g_signal_connect_swapped (select_all_action, "activate", - G_CALLBACK (on_select_all), view); } return view;