Mercurial > vim

comparison src/gui_gtk_f.c @ 31651:e5ee2ffd826a v9.0.1158

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
31650:0f3310ec8487 31651:e5ee2ffd826a
186 void 186 void
187 gui_gtk_form_thaw(GtkForm *form) 187 gui_gtk_form_thaw(GtkForm *form)
188 { 188 {
189 g_return_if_fail(GTK_IS_FORM(form)); 189 g_return_if_fail(GTK_IS_FORM(form));
190 190
191 if (form->freeze_count) 191 if (!form->freeze_count)
192 { 192 return;
193 if (!(--form->freeze_count)) 193
194 { 194 if (!(--form->freeze_count))
195 form_position_children(form); 195 {
196 gtk_widget_queue_draw(GTK_WIDGET(form)); 196 form_position_children(form);
197 } 197 gtk_widget_queue_draw(GTK_WIDGET(form));
198 } 198 }
199 } 199 }
200 200
201 // Basic Object handling procedures 201 // Basic Object handling procedures
202 202
608 if (child->widget == widget) 608 if (child->widget == widget)
609 break; 609 break;
610 tmp_list = tmp_list->next; 610 tmp_list = tmp_list->next;
611 } 611 }
612 612
613 if (tmp_list) 613 if (tmp_list == NULL)
614 { 614 return;
615 #if GTK_CHECK_VERSION(3,0,0) 615
616 const gboolean was_visible = gtk_widget_get_visible(widget); 616 #if GTK_CHECK_VERSION(3,0,0)
617 #endif 617 const gboolean was_visible = gtk_widget_get_visible(widget);
618 if (child->window) 618 #endif
619 { 619 if (child->window)
620 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), 620 {
621 FUNC2GENERIC(&form_child_map), child); 621 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget),
622 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget), 622 FUNC2GENERIC(&form_child_map), child);
623 FUNC2GENERIC(&form_child_unmap), child); 623 g_signal_handlers_disconnect_by_func(G_OBJECT(child->widget),
624 624 FUNC2GENERIC(&form_child_unmap), child);
625 // FIXME: This will cause problems for reparenting NO_WINDOW 625
626 // widgets out of a GtkForm 626 // FIXME: This will cause problems for reparenting NO_WINDOW
627 gdk_window_set_user_data(child->window, NULL); 627 // widgets out of a GtkForm
628 gdk_window_destroy(child->window); 628 gdk_window_set_user_data(child->window, NULL);
629 } 629 gdk_window_destroy(child->window);
630 gtk_widget_unparent(widget); 630 }
631 #if GTK_CHECK_VERSION(3,0,0) 631 gtk_widget_unparent(widget);
632 if (was_visible) 632 #if GTK_CHECK_VERSION(3,0,0)
633 gtk_widget_queue_resize(GTK_WIDGET(container)); 633 if (was_visible)
634 #endif 634 gtk_widget_queue_resize(GTK_WIDGET(container));
635 form->children = g_list_remove_link(form->children, tmp_list); 635 #endif
636 g_list_free_1(tmp_list); 636 form->children = g_list_remove_link(form->children, tmp_list);
637 g_free(child); 637 g_list_free_1(tmp_list);
638 } 638 g_free(child);
639 } 639 }
640 640
641 static void 641 static void
642 form_forall(GtkContainer *container, 642 form_forall(GtkContainer *container,
643 gboolean include_internals UNUSED, 643 gboolean include_internals UNUSED,