From 262d6a6e7a99c93bd29983bc9ec040c922fe4d37 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 8 Jul 2022 10:33:05 -0300
Subject: [PATCH] project: Remove most can-focus properties

In GTK4, can-focus usage is much more specific to widget subclasses,
and in almost all cases it's not necessary to set it.

Remove it everywhere, except in one case where it still needs to be
manually set to False.
---
 libmalcontent-ui/user-controls.ui | 3 ---
 malcontent-control/application.c  | 7 +------
 malcontent-control/carousel.ui    | 5 +----
 malcontent-control/main.ui        | 3 ---
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/libmalcontent-ui/user-controls.ui b/libmalcontent-ui/user-controls.ui
index 3e452cf..96d38de 100644
--- a/libmalcontent-ui/user-controls.ui
+++ b/libmalcontent-ui/user-controls.ui
@@ -36,7 +36,6 @@
                 <property name="subtitle_lines">0</property>
                 <child>
                   <object class="GtkSwitch" id="restrict_web_browsers_switch">
-                    <property name="can_focus">True</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <signal name="notify::active" handler="on_restrict_web_browsers_switch_active_changed_cb" object="MctUserControls" swapped="no" />
@@ -85,7 +84,6 @@
                 <property name="subtitle_lines">0</property>
                 <child>
                   <object class="GtkSwitch" id="restrict_software_installation_switch">
-                    <property name="can_focus">True</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <signal name="notify::active" handler="on_restrict_installation_switch_active_changed_cb" object="MctUserControls" swapped="no" />
@@ -106,7 +104,6 @@
                 <property name="subtitle_lines">0</property>
                 <child>
                   <object class="GtkMenuButton" id="oars_button">
-                    <property name="can_focus">True</property>
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="direction">right</property>
diff --git a/malcontent-control/application.c b/malcontent-control/application.c
index b327ad5..89e7541 100644
--- a/malcontent-control/application.c
+++ b/malcontent-control/application.c
@@ -427,12 +427,7 @@ update_main_stack (MctApplication *self)
   gtk_stack_set_visible_child_name (self->main_stack, new_page_name);
 
   if (new_focus_widget != NULL && !g_str_equal (old_page_name, new_page_name))
-    {
-      if (gtk_widget_get_can_focus (new_focus_widget))
-        gtk_widget_grab_focus (new_focus_widget);
-      else
-        gtk_widget_child_focus (new_focus_widget, GTK_DIR_TAB_FORWARD);
-    }
+    gtk_widget_grab_focus (new_focus_widget);
 }
 
 static void
diff --git a/malcontent-control/carousel.ui b/malcontent-control/carousel.ui
index 02a4992..4e03dad 100644
--- a/malcontent-control/carousel.ui
+++ b/malcontent-control/carousel.ui
@@ -28,14 +28,12 @@
                 <child>
                   <object class="GtkButton" id="go_back_button">
                     <property name="visible">False</property>
-                    <property name="can_focus">True</property>
                     <property name="valign">center</property>
                     <style>
                       <class name="circular"/>
                     </style>
                     <child>
                       <object class="GtkImage">
-                        <property name="can_focus">False</property>
                         <property name="icon-size">4</property>
                         <property name="icon_name">go-previous-symbolic</property>
                         <child internal-child="accessible">
@@ -53,14 +51,12 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="go_next_button">
-                    <property name="can_focus">True</property>
                     <property name="valign">center</property>
                     <style>
                       <class name="circular"/>
                     </style>
                     <child>
                       <object class="GtkImage">
-                        <property name="can_focus">False</property>
                         <property name="icon-size">4</property>
                         <property name="icon_name">go-next-symbolic</property>
                         <child internal-child="accessible">
@@ -80,6 +76,7 @@
             </child>
             <child type="overlay">
               <object class="GtkBox">
+                <property name="can-focus">False</property>
                 <property name="valign">GTK_ALIGN_END</property>
                 <style>
                   <class name="carousel-arrow-container"/>
diff --git a/malcontent-control/main.ui b/malcontent-control/main.ui
index 1526bfb..792db28 100644
--- a/malcontent-control/main.ui
+++ b/malcontent-control/main.ui
@@ -16,7 +16,6 @@
             <child>
               <object class="GtkMenuButton" id="primary_menu">
                 <property name="direction">none</property>
-                <property name="can-focus">True</property>
                 <property name="use-popover">True</property>
                 <property name="menu-model">primary-menu</property>
                 <accelerator key="F10" signal="activate"/>
@@ -76,7 +75,6 @@
                     <property name="halign">center</property>
                     <property name="can-default">True</property>
                     <property name="has-default">True</property>
-                    <property name="can-focus">True</property>
                   </object>
                 </child>
               </object>
@@ -98,7 +96,6 @@
                     <property name="can-default">True</property>
                     <property name="has-default">True</property>
                     <property name="use-underline">True</property>
-                    <property name="can-focus">True</property>
                     <style>
                       <class name="suggested-action"/>
                     </style>