mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-07-03 17:33:25 +00:00
app: minor cleanups in GimpDrawableTreeView
This commit is contained in:
parent
624a62d489
commit
2b82907967
1 changed files with 40 additions and 40 deletions
|
@ -776,25 +776,22 @@ gimp_drawable_tree_view_filters_changed (GimpDrawable *drawable,
|
||||||
/* Since floating selections are also stored in the filter stack,
|
/* Since floating selections are also stored in the filter stack,
|
||||||
* we need to verify what's in there to get the correct count
|
* we need to verify what's in there to get the correct count
|
||||||
*/
|
*/
|
||||||
if (filters)
|
for (list = GIMP_LIST (filters)->queue->tail;
|
||||||
|
list;
|
||||||
|
list = g_list_previous (list))
|
||||||
{
|
{
|
||||||
for (list = GIMP_LIST (filters)->queue->tail;
|
if (GIMP_IS_DRAWABLE_FILTER (list->data))
|
||||||
list;
|
|
||||||
list = g_list_previous (list))
|
|
||||||
{
|
{
|
||||||
if (GIMP_IS_DRAWABLE_FILTER (list->data))
|
n_filters++;
|
||||||
{
|
|
||||||
n_filters++;
|
|
||||||
|
|
||||||
if (temporary_only)
|
if (temporary_only)
|
||||||
g_object_get (list->data,
|
g_object_get (list->data,
|
||||||
"temporary", &temporary_only,
|
"temporary", &temporary_only,
|
||||||
NULL);
|
NULL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fs_disabled = TRUE;
|
fs_disabled = TRUE;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -873,7 +870,7 @@ gimp_drawable_tree_view_effects_clicked (GtkCellRendererToggle *toggle,
|
||||||
GimpContainer *filters;
|
GimpContainer *filters;
|
||||||
GdkRectangle rect;
|
GdkRectangle rect;
|
||||||
GtkWidget *filter_view;
|
GtkWidget *filter_view;
|
||||||
GList *filter_list;
|
GList *list;
|
||||||
GList *children;
|
GList *children;
|
||||||
gint n_children = 0;
|
gint n_children = 0;
|
||||||
gboolean visible = TRUE;
|
gboolean visible = TRUE;
|
||||||
|
@ -903,13 +900,13 @@ gimp_drawable_tree_view_effects_clicked (GtkCellRendererToggle *toggle,
|
||||||
|
|
||||||
filters = gimp_drawable_get_filters (drawable);
|
filters = gimp_drawable_get_filters (drawable);
|
||||||
|
|
||||||
for (filter_list = GIMP_LIST (filters)->queue->tail;
|
for (list = GIMP_LIST (filters)->queue->tail;
|
||||||
filter_list;
|
list;
|
||||||
filter_list = g_list_previous (filter_list))
|
list = g_list_previous (list))
|
||||||
{
|
{
|
||||||
if (GIMP_IS_DRAWABLE_FILTER (filter_list->data))
|
if (GIMP_IS_DRAWABLE_FILTER (list->data))
|
||||||
{
|
{
|
||||||
if (! gimp_filter_get_active (GIMP_FILTER (filter_list->data)))
|
if (! gimp_filter_get_active (GIMP_FILTER (list->data)))
|
||||||
visible = FALSE;
|
visible = FALSE;
|
||||||
|
|
||||||
n_children++;
|
n_children++;
|
||||||
|
@ -975,17 +972,18 @@ gimp_drawable_tree_view_effects_clicked (GtkCellRendererToggle *toggle,
|
||||||
filter_tree_view, 0);
|
filter_tree_view, 0);
|
||||||
|
|
||||||
/* Update filter visible icon */
|
/* Update filter visible icon */
|
||||||
for (filter_list = GIMP_LIST (filters)->queue->tail; filter_list;
|
for (list = GIMP_LIST (filters)->queue->tail;
|
||||||
filter_list = g_list_previous (filter_list))
|
list;
|
||||||
|
list = g_list_previous (list))
|
||||||
{
|
{
|
||||||
if (GIMP_IS_DRAWABLE_FILTER (filter_list->data))
|
if (GIMP_IS_DRAWABLE_FILTER (list->data))
|
||||||
{
|
{
|
||||||
gboolean is_temporary;
|
gboolean is_temporary;
|
||||||
|
|
||||||
gimp_drawable_tree_view_filter_active_changed (GIMP_FILTER (filter_list->data),
|
gimp_drawable_tree_view_filter_active_changed (GIMP_FILTER (list->data),
|
||||||
filter_tree_view);
|
filter_tree_view);
|
||||||
|
|
||||||
g_object_get (filter_list->data,
|
g_object_get (list->data,
|
||||||
"temporary", &is_temporary,
|
"temporary", &is_temporary,
|
||||||
NULL);
|
NULL);
|
||||||
if (is_temporary)
|
if (is_temporary)
|
||||||
|
@ -1155,14 +1153,16 @@ gimp_drawable_tree_view_effects_visible_all_toggled (GtkWidget *widge
|
||||||
{
|
{
|
||||||
if (view->priv->effects_drawable)
|
if (view->priv->effects_drawable)
|
||||||
{
|
{
|
||||||
gboolean visible;
|
GimpContainer *filters;
|
||||||
GimpContainer *filter_stack;
|
|
||||||
GList *list;
|
GList *list;
|
||||||
|
gboolean visible;
|
||||||
|
|
||||||
visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
|
visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
|
||||||
filter_stack = gimp_drawable_get_filters (GIMP_DRAWABLE (view->priv->effects_drawable));
|
|
||||||
|
|
||||||
for (list = GIMP_LIST (filter_stack)->queue->head; list;
|
filters = gimp_drawable_get_filters (GIMP_DRAWABLE (view->priv->effects_drawable));
|
||||||
|
|
||||||
|
for (list = GIMP_LIST (filters)->queue->head;
|
||||||
|
list;
|
||||||
list = g_list_next (list))
|
list = g_list_next (list))
|
||||||
{
|
{
|
||||||
if (GIMP_IS_DRAWABLE_FILTER (list->data))
|
if (GIMP_IS_DRAWABLE_FILTER (list->data))
|
||||||
|
@ -1273,13 +1273,13 @@ gimp_drawable_tree_view_effects_raise_clicked (GtkWidget *widget,
|
||||||
{
|
{
|
||||||
if (gtk_widget_get_sensitive (view->priv->effects_edit_button))
|
if (gtk_widget_get_sensitive (view->priv->effects_edit_button))
|
||||||
{
|
{
|
||||||
GimpContainer *container;
|
GimpContainer *filters;
|
||||||
gint index;
|
gint index;
|
||||||
|
|
||||||
container =
|
filters =
|
||||||
gimp_drawable_get_filters (GIMP_DRAWABLE (view->priv->effects_drawable));
|
gimp_drawable_get_filters (GIMP_DRAWABLE (view->priv->effects_drawable));
|
||||||
|
|
||||||
index = gimp_container_get_child_index (container,
|
index = gimp_container_get_child_index (filters,
|
||||||
GIMP_OBJECT (view->priv->effects_filter));
|
GIMP_OBJECT (view->priv->effects_filter));
|
||||||
|
|
||||||
gtk_widget_set_sensitive (view->priv->effects_lower_button, TRUE);
|
gtk_widget_set_sensitive (view->priv->effects_lower_button, TRUE);
|
||||||
|
@ -1310,17 +1310,17 @@ gimp_drawable_tree_view_effects_lower_clicked (GtkWidget *widget,
|
||||||
{
|
{
|
||||||
if (gtk_widget_get_sensitive (view->priv->effects_edit_button))
|
if (gtk_widget_get_sensitive (view->priv->effects_edit_button))
|
||||||
{
|
{
|
||||||
GimpContainer *container;
|
GimpContainer *filters;
|
||||||
gint index;
|
gint index;
|
||||||
|
|
||||||
container =
|
filters =
|
||||||
gimp_drawable_get_filters (GIMP_DRAWABLE (view->priv->effects_drawable));
|
gimp_drawable_get_filters (GIMP_DRAWABLE (view->priv->effects_drawable));
|
||||||
|
|
||||||
index = gimp_container_get_child_index (container,
|
index = gimp_container_get_child_index (filters,
|
||||||
GIMP_OBJECT (view->priv->effects_filter));
|
GIMP_OBJECT (view->priv->effects_filter));
|
||||||
|
|
||||||
gtk_widget_set_sensitive (view->priv->effects_raise_button, TRUE);
|
gtk_widget_set_sensitive (view->priv->effects_raise_button, TRUE);
|
||||||
if (index == gimp_container_get_n_children (container) - 1)
|
if (index == gimp_container_get_n_children (filters) - 1)
|
||||||
gtk_widget_set_sensitive (view->priv->effects_lower_button, FALSE);
|
gtk_widget_set_sensitive (view->priv->effects_lower_button, FALSE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1385,8 +1385,8 @@ gimp_drawable_tree_view_effects_remove_clicked (GtkWidget *widget,
|
||||||
|
|
||||||
filters = gimp_drawable_get_filters (view->priv->effects_drawable);
|
filters = gimp_drawable_get_filters (view->priv->effects_drawable);
|
||||||
|
|
||||||
if (filters != NULL &&
|
if (gimp_container_have (filters,
|
||||||
gimp_container_have (filters, GIMP_OBJECT (view->priv->effects_filter)))
|
GIMP_OBJECT (view->priv->effects_filter)))
|
||||||
{
|
{
|
||||||
gimp_image_undo_push_filter_remove (image, _("Remove filter"),
|
gimp_image_undo_push_filter_remove (image, _("Remove filter"),
|
||||||
view->priv->effects_drawable,
|
view->priv->effects_drawable,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue