Use gtk_widget_set_visible()
In places where the pattern if (show) gtk_widget_show (widget); else gtk_widget_hide (widget); is used, change to gtk_widget_set_visible (widget, show); Also do some other minor cleanups.
This commit is contained in:
@ -207,12 +207,7 @@ gimp_color_scales_togg_visible (GimpColorSelector *selector,
|
||||
gint i;
|
||||
|
||||
for (i = 0; i < 6; i++)
|
||||
{
|
||||
if (visible)
|
||||
gtk_widget_show (scales->toggles[i]);
|
||||
else
|
||||
gtk_widget_hide (scales->toggles[i]);
|
||||
}
|
||||
gtk_widget_set_visible (scales->toggles[i], visible);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -236,18 +231,9 @@ gimp_color_scales_set_show_alpha (GimpColorSelector *selector,
|
||||
show_alpha ? 3 : 0);
|
||||
}
|
||||
|
||||
if (show_alpha)
|
||||
{
|
||||
gtk_widget_show (label);
|
||||
gtk_widget_show (scale);
|
||||
gtk_widget_show (spin);
|
||||
}
|
||||
else
|
||||
{
|
||||
gtk_widget_hide (label);
|
||||
gtk_widget_hide (scale);
|
||||
gtk_widget_hide (spin);
|
||||
}
|
||||
gtk_widget_set_visible (label, show_alpha);
|
||||
gtk_widget_set_visible (scale, show_alpha);
|
||||
gtk_widget_set_visible (spin, show_alpha);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -373,10 +373,7 @@ gimp_color_select_togg_visible (GimpColorSelector *selector,
|
||||
{
|
||||
GimpColorSelect *select = GIMP_COLOR_SELECT (selector);
|
||||
|
||||
if (visible)
|
||||
gtk_widget_show (select->toggle_box);
|
||||
else
|
||||
gtk_widget_hide (select->toggle_box);
|
||||
gtk_widget_set_visible (select->toggle_box, visible);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -306,10 +306,8 @@ gimp_scrolled_preview_area_size_allocate (GtkWidget *widget,
|
||||
switch (priv->hscr_policy)
|
||||
{
|
||||
case GTK_POLICY_AUTOMATIC:
|
||||
if (width > GIMP_PREVIEW (preview)->width)
|
||||
gtk_widget_show (preview->hscr);
|
||||
else
|
||||
gtk_widget_hide (preview->hscr);
|
||||
gtk_widget_set_visible (preview->hscr,
|
||||
width > GIMP_PREVIEW (preview)->width);
|
||||
break;
|
||||
|
||||
case GTK_POLICY_ALWAYS:
|
||||
@ -326,10 +324,8 @@ gimp_scrolled_preview_area_size_allocate (GtkWidget *widget,
|
||||
switch (priv->vscr_policy)
|
||||
{
|
||||
case GTK_POLICY_AUTOMATIC:
|
||||
if (height > GIMP_PREVIEW (preview)->height)
|
||||
gtk_widget_show (preview->vscr);
|
||||
else
|
||||
gtk_widget_hide (preview->vscr);
|
||||
gtk_widget_set_visible (preview->vscr,
|
||||
height > GIMP_PREVIEW (preview)->height);
|
||||
break;
|
||||
|
||||
case GTK_POLICY_ALWAYS:
|
||||
@ -341,16 +337,10 @@ gimp_scrolled_preview_area_size_allocate (GtkWidget *widget,
|
||||
break;
|
||||
}
|
||||
|
||||
if (GTK_WIDGET_VISIBLE (preview->vscr) &&
|
||||
GTK_WIDGET_VISIBLE (preview->hscr) &&
|
||||
GIMP_PREVIEW_GET_CLASS (preview)->draw_thumb)
|
||||
{
|
||||
gtk_widget_show (preview->nav_icon);
|
||||
}
|
||||
else
|
||||
{
|
||||
gtk_widget_hide (preview->nav_icon);
|
||||
}
|
||||
gtk_widget_set_visible (preview->nav_icon,
|
||||
GTK_WIDGET_VISIBLE (preview->vscr) &&
|
||||
GTK_WIDGET_VISIBLE (preview->hscr) &&
|
||||
GIMP_PREVIEW_GET_CLASS (preview)->draw_thumb);
|
||||
|
||||
gimp_scrolled_preview_thaw (preview);
|
||||
}
|
||||
|
@ -1343,10 +1343,7 @@ gimp_size_entry_show_unit_menu (GimpSizeEntry *gse,
|
||||
{
|
||||
g_return_if_fail (GIMP_IS_SIZE_ENTRY (gse));
|
||||
|
||||
if (show)
|
||||
gtk_widget_show (gse->unitmenu);
|
||||
else
|
||||
gtk_widget_hide (gse->unitmenu);
|
||||
gtk_widget_set_visible (gse->unitmenu, show);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user