diff options
author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2023-01-08 13:44:24 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2023-01-08 13:44:24 +0000 |
commit | 7f8b2559a30e2e2a443c35b28e94c6b45ba7ae04 (patch) | |
tree | 04c0145c1e3cf9777d58c91fa7b2ad231cfecf8d /src/gui_gtk_f.c | |
parent | df8f9473596c8fb18ec893de677dba455e8925b3 (diff) |
patch 9.0.1158: code is indented more than necessaryv9.0.1158
Problem: Code is indented more than necessary.
Solution: Use an early return where it makes sense. (Yegappan Lakshmanan,
closes #11787)
Diffstat (limited to 'src/gui_gtk_f.c')
-rw-r--r-- | src/gui_gtk_f.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/gui_gtk_f.c b/src/gui_gtk_f.c index c8f90c2d79..1ae1bd795e 100644 --- a/src/gui_gtk_f.c +++ b/src/gui_gtk_f.c @@ -188,13 +188,13 @@ gui_gtk_form_thaw(GtkForm *form) { g_return_if_fail(GTK_IS_FORM(form)); - if (form->freeze_count) + if (!form->freeze_count) + return; + + if (!(--form->freeze_count)) { - if (!(--form->freeze_count)) - { - form_position_children(form); - gtk_widget_queue_draw(GTK_WIDGET(form)); - } + form_position_children(form); + gtk_widget_queue_draw(GTK_WIDGET(form)); } } @@ -610,32 +610,32 @@ form_remove(GtkContainer *container, GtkWidget *widget) tmp_list = tmp_list->next; } - if (tmp_list) - { -#if GTK_CHECK_VERSION(3,0,0) - const gboolean was_visible = gtk_widget_get_visible(widget); -#endif - if (child->window) - { - g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), - FUNC2GENERIC(&form_child_map), child); - g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), - FUNC2GENERIC(&form_child_unmap), child); + if (tmp_list == NULL) + return; - // FIXME: This will cause problems for reparenting NO_WINDOW - // widgets out of a GtkForm - gdk_window_set_user_data(child->window, NULL); - gdk_window_destroy(child->window); - } - gtk_widget_unparent(widget); #if GTK_CHECK_VERSION(3,0,0) - if (was_visible) - gtk_widget_queue_resize(GTK_WIDGET(container)); + const gboolean was_visible = gtk_widget_get_visible(widget); #endif - form->children = g_list_remove_link(form->children, tmp_list); - g_list_free_1(tmp_list); - g_free(child); + if (child->window) + { + g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), + FUNC2GENERIC(&form_child_map), child); + g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), + FUNC2GENERIC(&form_child_unmap), child); + + // FIXME: This will cause problems for reparenting NO_WINDOW + // widgets out of a GtkForm + gdk_window_set_user_data(child->window, NULL); + gdk_window_destroy(child->window); } + gtk_widget_unparent(widget); +#if GTK_CHECK_VERSION(3,0,0) + if (was_visible) + gtk_widget_queue_resize(GTK_WIDGET(container)); +#endif + form->children = g_list_remove_link(form->children, tmp_list); + g_list_free_1(tmp_list); + g_free(child); } static void |