callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

color-editor: don't use an alignment to give the popup extra space

Browse Source
This commit is contained in:
Cosimo Cecchi
2012-02-09 14:06:43 -05:00
committed by Matthias Clasen
parent 2abe72283e
commit 1cbaca6c60
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkcoloreditor.c
View File

@ -375,7 +375,6 @@ gtk_color_editor_init (GtkColorEditor *editor)
{ {
GtkWidget *grid; GtkWidget *grid;
GtkWidget *slider; GtkWidget *slider;
GtkWidget *alignment;
GtkWidget *entry; GtkWidget *entry;
GtkWidget *swatch; GtkWidget *swatch;
GtkAdjustment *h_adj, *s_adj, *v_adj, *a_adj; GtkAdjustment *h_adj, *s_adj, *v_adj, *a_adj;
@ -448,16 +447,15 @@ gtk_color_editor_init (GtkColorEditor *editor)
gtk_grid_attach (GTK_GRID (grid), editor->priv->sv_plane, 1, 1, 2, 1); gtk_grid_attach (GTK_GRID (grid), editor->priv->sv_plane, 1, 1, 2, 1);
gtk_grid_attach (GTK_GRID (grid), editor->priv->a_slider, 1, 2, 2, 1); gtk_grid_attach (GTK_GRID (grid), editor->priv->a_slider, 1, 2, 2, 1);
/* This extra alignment is necessary so we have room to the sides /* This extra margin is necessary so we have room to the sides
* to place the popups as desired * to place the popups as desired
*/ */
alignment = gtk_alignment_new (0.5, 0.5, 0, 0); gtk_widget_set_margin_left (grid, 30);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 30, 30); gtk_widget_set_margin_right (grid, 30);
gtk_container_add (GTK_CONTAINER (alignment), grid);
editor->priv->overlay = gtk_overlay_new (); editor->priv->overlay = gtk_overlay_new ();
gtk_widget_override_background_color (editor->priv->overlay, 0, &transparent); gtk_widget_override_background_color (editor->priv->overlay, 0, &transparent);
gtk_container_add (GTK_CONTAINER (editor->priv->overlay), alignment); gtk_container_add (GTK_CONTAINER (editor->priv->overlay), grid);
/* Construct the sv popup */ /* Construct the sv popup */
editor->priv->s_entry = entry = gtk_spin_button_new (scaled_adjustment (s_adj, 100), 1, 0); editor->priv->s_entry = entry = gtk_spin_button_new (scaled_adjustment (s_adj, 100), 1, 0);