Mercurial > vim
diff src/gui_gtk_f.c @ 31651:e5ee2ffd826a v9.0.1158
patch 9.0.1158: code is indented more than necessary
Commit: https://github.com/vim/vim/commit/7f8b2559a30e2e2a443c35b28e94c6b45ba7ae04
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Sun Jan 8 13:44:24 2023 +0000
patch 9.0.1158: code is indented more than necessary
Problem: Code is indented more than necessary.
Solution: Use an early return where it makes sense. (Yegappan Lakshmanan,
closes #11787)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 08 Jan 2023 14:45:05 +0100 |
parents | dd711a44e75b |
children |
line wrap: on
line diff
--- 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, Gtk tmp_list = tmp_list->next; } - if (tmp_list) - { + if (tmp_list == NULL) + return; + #if GTK_CHECK_VERSION(3,0,0) - const gboolean was_visible = gtk_widget_get_visible(widget); + 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 (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); + // 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)); + 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); - } + form->children = g_list_remove_link(form->children, tmp_list); + g_list_free_1(tmp_list); + g_free(child); } static void