[gimp/gimp-2-10] app: some formatting in the edit non-visible layers code
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] app: some formatting in the edit non-visible layers code
- Date: Mon, 24 Jun 2019 14:02:22 +0000 (UTC)
commit 86c858cc539ae7b0f7101591c7d2b531005767df
Author: Michael Natterer <mitch gimp org>
Date: Mon Jun 24 15:57:21 2019 +0200
app: some formatting in the edit non-visible layers code
(cherry picked from commit e47936182eb7b899297fd0279bc5401b4b072084)
app/dialogs/preferences-dialog.c | 4 ++--
app/tools/gimpbucketfilltool.c | 6 ++++--
app/tools/gimpcagetool.c | 6 ++++--
app/tools/gimpfiltertool.c | 3 ++-
app/tools/gimpforegroundselecttool.c | 3 ++-
app/tools/gimpgradienttool.c | 6 ++++--
app/tools/gimppainttool.c | 6 ++++--
app/tools/gimpwarptool.c | 3 ++-
8 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 4e6b74919d..7ae801f734 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1645,8 +1645,8 @@ prefs_dialog_new (Gimp *gimp,
vbox2 = prefs_frame_new (_("General"), GTK_CONTAINER (vbox), FALSE);
prefs_check_button_add (object, "edit-non-visible",
- _("Allow _editing on non-visible layers"),
- GTK_BOX (vbox2));
+ _("Allow _editing on non-visible layers"),
+ GTK_BOX (vbox2));
prefs_check_button_add (object, "save-tool-options",
_("_Save tool options on exit"),
diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c
index 217794f6da..803ad20f7c 100644
--- a/app/tools/gimpbucketfilltool.c
+++ b/app/tools/gimpbucketfilltool.c
@@ -492,7 +492,8 @@ gimp_bucket_fill_tool_button_press (GimpTool *tool,
return;
}
- if (! gimp_item_is_visible (GIMP_ITEM (drawable)) && ! config->edit_non_visible)
+ if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+ ! config->edit_non_visible)
{
gimp_tool_message_literal (tool, display,
_("The active layer is not visible."));
@@ -774,7 +775,8 @@ gimp_bucket_fill_tool_cursor_update (GimpTool *tool,
if (! gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) &&
! gimp_item_is_content_locked (GIMP_ITEM (drawable)) &&
- (gimp_item_is_visible (GIMP_ITEM (drawable)) || config->edit_non_visible))
+ (gimp_item_is_visible (GIMP_ITEM (drawable)) ||
+ config->edit_non_visible))
{
switch (options->fill_mode)
{
diff --git a/app/tools/gimpcagetool.c b/app/tools/gimpcagetool.c
index ffd2a120cc..37bb4c2e58 100644
--- a/app/tools/gimpcagetool.c
+++ b/app/tools/gimpcagetool.c
@@ -237,7 +237,8 @@ gimp_cage_tool_initialize (GimpTool *tool,
return FALSE;
}
- if (! gimp_item_is_visible (GIMP_ITEM (drawable)) && ! config->edit_non_visible)
+ if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+ ! config->edit_non_visible)
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("The active layer is not visible."));
@@ -697,7 +698,8 @@ gimp_cage_tool_cursor_update (GimpTool *tool,
if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) ||
gimp_item_is_content_locked (GIMP_ITEM (drawable)) ||
- ! (gimp_item_is_visible (GIMP_ITEM (drawable)) || config->edit_non_visible))
+ ! (gimp_item_is_visible (GIMP_ITEM (drawable)) ||
+ config->edit_non_visible))
{
modifier = GIMP_CURSOR_MODIFIER_BAD;
}
diff --git a/app/tools/gimpfiltertool.c b/app/tools/gimpfiltertool.c
index 134c718eaf..963c820098 100644
--- a/app/tools/gimpfiltertool.c
+++ b/app/tools/gimpfiltertool.c
@@ -287,7 +287,8 @@ gimp_filter_tool_initialize (GimpTool *tool,
return FALSE;
}
- if (! gimp_item_is_visible (GIMP_ITEM (drawable)) && ! config->edit_non_visible)
+ if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+ ! config->edit_non_visible)
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("The active layer is not visible."));
diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c
index 297aaa0084..39ee1913ca 100644
--- a/app/tools/gimpforegroundselecttool.c
+++ b/app/tools/gimpforegroundselecttool.c
@@ -287,7 +287,8 @@ gimp_foreground_select_tool_initialize (GimpTool *tool,
if (! drawable)
return FALSE;
- if (! gimp_item_is_visible (GIMP_ITEM (drawable)) && ! config->edit_non_visible)
+ if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+ ! config->edit_non_visible)
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("The active layer is not visible."));
diff --git a/app/tools/gimpgradienttool.c b/app/tools/gimpgradienttool.c
index b3567b394d..33488a85c2 100644
--- a/app/tools/gimpgradienttool.c
+++ b/app/tools/gimpgradienttool.c
@@ -262,7 +262,8 @@ gimp_gradient_tool_initialize (GimpTool *tool,
return FALSE;
}
- if (! gimp_item_is_visible (GIMP_ITEM (drawable)) && ! config->edit_non_visible)
+ if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+ ! config->edit_non_visible)
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("The active layer is not visible."));
@@ -453,7 +454,8 @@ gimp_gradient_tool_cursor_update (GimpTool *tool,
if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) ||
gimp_item_is_content_locked (GIMP_ITEM (drawable)) ||
- ! (gimp_item_is_visible (GIMP_ITEM (drawable)) || config->edit_non_visible))
+ ! (gimp_item_is_visible (GIMP_ITEM (drawable)) ||
+ config->edit_non_visible))
{
gimp_tool_set_cursor (tool, display,
gimp_tool_control_get_cursor (tool->control),
diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c
index e529e566cf..f3d6922a33 100644
--- a/app/tools/gimppainttool.c
+++ b/app/tools/gimppainttool.c
@@ -310,7 +310,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
return;
}
- if (! gimp_item_is_visible (GIMP_ITEM (drawable)) && ! config->edit_non_visible)
+ if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+ ! config->edit_non_visible)
{
gimp_tool_message_literal (tool, display,
_("The active layer is not visible."));
@@ -495,7 +496,8 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)) ||
gimp_item_is_content_locked (GIMP_ITEM (drawable)) ||
! gimp_paint_tool_check_alpha (paint_tool, drawable, display, NULL) ||
- ! (gimp_item_is_visible (GIMP_ITEM (drawable)) || config->edit_non_visible))
+ ! (gimp_item_is_visible (GIMP_ITEM (drawable)) ||
+ config->edit_non_visible))
{
modifier = GIMP_CURSOR_MODIFIER_BAD;
toggle_modifier = GIMP_CURSOR_MODIFIER_BAD;
diff --git a/app/tools/gimpwarptool.c b/app/tools/gimpwarptool.c
index 352b3f7f66..2d308fb496 100644
--- a/app/tools/gimpwarptool.c
+++ b/app/tools/gimpwarptool.c
@@ -688,7 +688,8 @@ gimp_warp_tool_can_stroke (GimpWarpTool *wt,
return FALSE;
}
- if (! gimp_item_is_visible (GIMP_ITEM (drawable)) && ! config->edit_non_visible)
+ if (! gimp_item_is_visible (GIMP_ITEM (drawable)) &&
+ ! config->edit_non_visible)
{
if (show_message)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]