From 79941f95923b8fd21e593f68687c46c510a07e4d Mon Sep 17 00:00:00 2001
From: yggverse <yggverse@project>
Date: Mon, 16 Dec 2024 13:50:31 +0200
Subject: [PATCH] fix vertical alignment

---
 .../browser/window/tab/item/page/content/text/search.rs   | 4 +++-
 .../window/tab/item/page/content/text/search/close.rs     | 6 +++---
 .../window/tab/item/page/content/text/search/input.rs     | 8 ++++++--
 .../tab/item/page/content/text/search/navigation/back.rs  | 8 +++-----
 .../item/page/content/text/search/navigation/forward.rs   | 8 +++-----
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/app/browser/window/tab/item/page/content/text/search.rs b/src/app/browser/window/tab/item/page/content/text/search.rs
index dda11870..db00b21e 100644
--- a/src/app/browser/window/tab/item/page/content/text/search.rs
+++ b/src/app/browser/window/tab/item/page/content/text/search.rs
@@ -10,7 +10,7 @@ use tag::Tag;
 
 use gtk::{
     prelude::{BoxExt, ButtonExt, CheckButtonExt, EditableExt, TextBufferExt},
-    Box, Button, Orientation, TextBuffer, TextIter, TextSearchFlags, TextTag,
+    Align, Box, Button, Orientation, TextBuffer, TextIter, TextSearchFlags, TextTag,
 };
 use std::rc::Rc;
 
@@ -35,6 +35,8 @@ impl Search {
         let g_box = Box::builder()
             .css_classes(["osd"])
             .orientation(Orientation::Horizontal)
+            .valign(Align::Center)
+            .vexpand(false)
             .visible(false)
             .build();
 
diff --git a/src/app/browser/window/tab/item/page/content/text/search/close.rs b/src/app/browser/window/tab/item/page/content/text/search/close.rs
index 11c2ecf5..3c2562cf 100644
--- a/src/app/browser/window/tab/item/page/content/text/search/close.rs
+++ b/src/app/browser/window/tab/item/page/content/text/search/close.rs
@@ -1,4 +1,4 @@
-use gtk::{gdk::Cursor, Button};
+use gtk::{gdk::Cursor, Align, Button};
 
 const MARGIN: i32 = 6;
 
@@ -6,10 +6,10 @@ pub fn new() -> Button {
     Button::builder()
         .cursor(&Cursor::from_name("default", None).unwrap())
         .icon_name("window-close-symbolic")
-        .margin_bottom(MARGIN)
         .margin_end(MARGIN)
         .margin_start(MARGIN)
-        .margin_top(MARGIN)
+        .valign(Align::Center)
+        .vexpand(false)
         .tooltip_text("Close find bar")
         .build()
 }
diff --git a/src/app/browser/window/tab/item/page/content/text/search/input.rs b/src/app/browser/window/tab/item/page/content/text/search/input.rs
index 44290918..0f9e4c88 100644
--- a/src/app/browser/window/tab/item/page/content/text/search/input.rs
+++ b/src/app/browser/window/tab/item/page/content/text/search/input.rs
@@ -1,6 +1,6 @@
 use gtk::{
     prelude::{EditableExt, EntryExt, WidgetExt},
-    Entry, EntryIconPosition,
+    Align, Entry, EntryIconPosition,
 };
 
 const MARGIN: i32 = 6;
@@ -17,12 +17,16 @@ impl Input {
         // Init widget
         let entry = Entry::builder()
             .hexpand(true)
+            .margin_bottom(MARGIN)
             .margin_end(MARGIN)
             .margin_start(MARGIN)
+            .margin_top(MARGIN)
             .placeholder_text("Find in text..")
             .primary_icon_activatable(false)
-            .primary_icon_sensitive(false)
             .primary_icon_name("system-search-symbolic")
+            .primary_icon_sensitive(false)
+            .valign(Align::Center)
+            .vexpand(false)
             .build();
 
         // Connect events
diff --git a/src/app/browser/window/tab/item/page/content/text/search/navigation/back.rs b/src/app/browser/window/tab/item/page/content/text/search/navigation/back.rs
index b5943276..b5d03f42 100644
--- a/src/app/browser/window/tab/item/page/content/text/search/navigation/back.rs
+++ b/src/app/browser/window/tab/item/page/content/text/search/navigation/back.rs
@@ -1,6 +1,4 @@
-use gtk::{gdk::Cursor, prelude::WidgetExt, Button};
-
-const MARGIN: i32 = 6;
+use gtk::{gdk::Cursor, prelude::WidgetExt, Align, Button};
 
 pub struct Back {
     pub button: Button,
@@ -15,10 +13,10 @@ impl Back {
             button: Button::builder()
                 .cursor(&Cursor::from_name("default", None).unwrap())
                 .icon_name("go-up-symbolic")
-                .margin_bottom(MARGIN)
-                .margin_top(MARGIN)
                 .sensitive(false)
                 .tooltip_text("Back")
+                .valign(Align::Center)
+                .vexpand(false)
                 .build(),
         }
     }
diff --git a/src/app/browser/window/tab/item/page/content/text/search/navigation/forward.rs b/src/app/browser/window/tab/item/page/content/text/search/navigation/forward.rs
index 99f69d3e..fb8357a4 100644
--- a/src/app/browser/window/tab/item/page/content/text/search/navigation/forward.rs
+++ b/src/app/browser/window/tab/item/page/content/text/search/navigation/forward.rs
@@ -1,6 +1,4 @@
-use gtk::{gdk::Cursor, prelude::WidgetExt, Button};
-
-const MARGIN: i32 = 6;
+use gtk::{gdk::Cursor, prelude::WidgetExt, Align, Button};
 
 pub struct Forward {
     pub button: Button,
@@ -15,10 +13,10 @@ impl Forward {
             button: Button::builder()
                 .cursor(&Cursor::from_name("default", None).unwrap())
                 .icon_name("go-down-symbolic")
-                .margin_bottom(MARGIN)
-                .margin_top(MARGIN)
                 .sensitive(false)
                 .tooltip_text("Forward")
+                .valign(Align::Center)
+                .vexpand(false)
                 .build(),
         }
     }