Merge branch 'dynamics-editor-scrollable' into 'master'

#1289: Paint Dynamics

Closes #1289

See merge request GNOME/gimp!1991
This commit is contained in:
Mark Sweeney 2025-07-01 14:48:08 +01:00
commit c5bcbfd957
2 changed files with 25 additions and 2 deletions

View file

@ -130,6 +130,7 @@ gimp_dynamics_editor_constructed (GObject *object)
GtkWidget *input_labels[7];
GtkWidget *vbox;
GtkWidget *icon_box;
GtkWidget *scrolled_window;
GtkWidget *grid;
gint n_inputs = G_N_ELEMENTS (input_labels);
gint i;
@ -149,8 +150,15 @@ gimp_dynamics_editor_constructed (GObject *object)
data_editor->context->gimp,
vbox);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
gtk_widget_show (scrolled_window);
grid = gtk_grid_new ();
gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER (scrolled_window), grid);
gtk_widget_show (grid);
gimp_dynamics_editor_init_output_editors (dynamics,

View file

@ -167,6 +167,8 @@ gimp_dynamics_output_editor_constructed (GObject *object)
GimpDynamicsOutputEditorPrivate *private;
GtkWidget *view;
GtkWidget *button;
GtkWidget *scrolled_window;
GtkWidget *vbox;
GtkCellRenderer *cell;
GtkTreeSelection *tree_sel;
gint i;
@ -271,9 +273,22 @@ gimp_dynamics_output_editor_constructed (GObject *object)
"text", INPUT_COLUMN_NAME,
NULL);
gtk_box_pack_start (GTK_BOX (editor), view, FALSE, FALSE, 0);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_vexpand (vbox, TRUE);
gtk_box_pack_start (GTK_BOX (vbox), view, TRUE, TRUE, 0);
gtk_widget_show (view);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (scrolled_window), vbox);
gtk_widget_show (vbox);
gtk_box_pack_end (GTK_BOX (editor), scrolled_window, TRUE, TRUE, 0);
gtk_widget_show (scrolled_window);
private->input_view = view;
tree_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));