From c78ad29f1c4666f820102881f2ea706d87283ccd Mon Sep 17 00:00:00 2001
From: yggverse <yggverse@project>
Date: Fri, 26 Jul 2024 21:12:15 +0300
Subject: [PATCH] make markup label focusable, remove event methods abstraction

---
 .../Browser/Container/Page/Content/Markup.php | 18 +++++++++--------
 .../Container/Page/Content/Gemtext.php        | 12 -----------
 .../Browser/Container/Page/Content/Plain.php  | 20 -------------------
 3 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/src/Abstract/Entity/Browser/Container/Page/Content/Markup.php b/src/Abstract/Entity/Browser/Container/Page/Content/Markup.php
index 8bcaee5c..daba44cf 100644
--- a/src/Abstract/Entity/Browser/Container/Page/Content/Markup.php
+++ b/src/Abstract/Entity/Browser/Container/Page/Content/Markup.php
@@ -36,10 +36,6 @@ abstract class Markup
             true
         );
 
-        $this->gtk->set_can_focus(
-            false
-        );
-
         $this->gtk->set_track_visited_links(
             true
         );
@@ -82,15 +78,21 @@ abstract class Markup
         );
     }
 
-    abstract protected function _onActivateLink(
+    protected function _onActivateLink(
         GtkLabel $label,
         string $href
-    ): bool;
+    ): bool
+    {
+        return false;
+    }
 
-    abstract protected function _onButtonPressEvent(
+    protected function _onButtonPressEvent(
         GtkLabel $label,
         GdkEvent $event
-    ): bool;
+    ): bool
+    {
+        return false;
+    }
 
     abstract public function set(
         string $value
diff --git a/src/Entity/Browser/Container/Page/Content/Gemtext.php b/src/Entity/Browser/Container/Page/Content/Gemtext.php
index 1aaa372d..f8a500d1 100644
--- a/src/Entity/Browser/Container/Page/Content/Gemtext.php
+++ b/src/Entity/Browser/Container/Page/Content/Gemtext.php
@@ -280,18 +280,6 @@ class Gemtext extends Markup
         );
     }
 
-    protected function _onButtonPressEvent(
-        GtkLabel $label,
-        GdkEvent $event
-    ): bool
-    {
-        // Markup container has focus event disabled (hidden cursor position)
-        // this solution deactivates Request entry on click Markup area
-        $this->content->page->container->tab->gtk->grab_focus();
-
-        return false;
-    }
-
     private function _wrap(
         string $value
     ): string
diff --git a/src/Entity/Browser/Container/Page/Content/Plain.php b/src/Entity/Browser/Container/Page/Content/Plain.php
index 08265127..64312b75 100644
--- a/src/Entity/Browser/Container/Page/Content/Plain.php
+++ b/src/Entity/Browser/Container/Page/Content/Plain.php
@@ -24,24 +24,4 @@ class Plain extends Markup
             )
         );
     }
-
-    protected function _onActivateLink(
-        GtkLabel $label,
-        string $href
-    ): bool
-    {
-        return true;
-    }
-
-    protected function _onButtonPressEvent(
-        GtkLabel $label,
-        GdkEvent $event
-    ): bool
-    {
-        // Markup container has focus event disabled (hidden cursor position)
-        // this solution deactivates Request entry on click Markup area
-        $this->content->page->container->tab->gtk->grab_focus();
-
-        return false;
-    }
 }
\ No newline at end of file