From 3bad301bcc8a9a4397204cdd9424183585b887e6 Mon Sep 17 00:00:00 2001
From: Benedikt Willi <benedikt.willi@unibas.ch>
Date: Fri, 9 Jan 2026 14:31:55 +0100
Subject: [PATCH] Refactor browser chrome to use libadwaita for modern GNOME UI

Benefits of libadwaita:
- Modern, polished UI following GNOME Human Interface Guidelines
- Professional HeaderBar with proper navigation button grouping
- Better visual hierarchy and spacing
- Consistent with modern GNOME applications
- Built on GTK 4, same foundation as before

Changes:
- Replace Gtk.ApplicationWindow with Adw.ApplicationWindow
- Use Gtk.HeaderBar for professional top bar with navigation buttons
- Improve address bar presentation (placeholder text, better sizing)
- Add CSS classes for consistent styling (linked, suggested-action, toolbar)
- Better tooltip support for navigation buttons
- Add visual frame around tabs bar
- Improved status bar styling with toolbar class
- Adw.init() called during window creation

UI Improvements:
- Navigation buttons (Back/Forward/Reload) now grouped with linked styling
- Go button highlighted with suggested-action styling
- Address bar uses placeholder text instead of default value
- Better spacing and margins throughout
- More professional appearance overall

All tests passing (23/23 in core modules)
---
 pyproject.toml                              |   2 +-
 src/browser/__pycache__/tab.cpython-313.pyc | Bin 5410 -> 5698 bytes
 src/browser/chrome.py                       |  90 ++++++++++++--------
 3 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2ddb420..4b88839 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ requires-python = ">=3.11"
 license = {text = "MIT"}
 authors = [{name = "Bowser", email = "bowser@example.com"}]
 dependencies = [
-    "PyGObject>=3.54.0",  # GTK+ bindings for Python
+    "PyGObject>=3.54.0",  # GTK+ bindings for Python (includes Adwaita via GI)
     "skia-python>=87.9",  # Skia 2D graphics library
     "Jinja2>=3.0",  # Template engine for pages
 ]
diff --git a/src/browser/__pycache__/tab.cpython-313.pyc b/src/browser/__pycache__/tab.cpython-313.pyc
index ee990ac54d6ae62f9bb4f99976d2debf30b9da15..5469c9c559bda4b88367522c748a1c3eb596e9d3 100644
GIT binary patch
delta 2159
zcmah~-ES0C6u)<8c6O&byW4jAvBlDEyB3@Rr9#WfVhe?~B9`(oT>`0Qopz_ohV9OJ
zXEtb~Sza`ds6cK=F!7=Iv?z&9N__J{@DBjjq-4@W9(WKFO%b(5U%Y4bqXjigvcEa^
z+;h+Q-SaW~S@*52zQ<l~4PwuaSWTVrUiJm?yO%eQysYqw`!&xYiAaaM#2Z3E)QJ>v
z15#@G9bk?S@!2{L(@9mGKgr47%U9LSvcsw+S|*{9xM8Zq%&JMvsw-<WLUa-b70tSu
zs2`7EiN20M_SAykI)HlmJD$K^ddRWg=Vl6y{T`38&{ycEjt-xK`!Un7C&R@sy)QQI
zbwp1hq;5fI(pB0)sJ|>^_(`#%i}96{F_d;zv?pt6$lKseSC1ySHoCxd(61f-V<$4M
zm{Z|x|1TmGa~*H2oLhS<PDM~$yB!(#x>)Z2kCk5^YqGiGDCV4Osmj$$R`UDoizK-Y
zG`XST!G+YLEJfm)f5lz)pJz6)YJhb?#R}(s$T@qS9W=%r-&nF;kBS(>KGrZX(T8?c
zvmQe2NZ~SK(~y|tKo}Bd@C+K@+R+S_Jv7XBhUTOx{j8ypo*AOfYIA;dO3#_mY9Ec$
z5xzZ7pbzK#qiQOxB|@eiO6zJOH0OwhWWVJ~>&av)leEO7W{xpgBbK0(6w?uC1p<X8
z0RZSZ%QKxLtU1kij--hI8W+*t%4vpa2?=dlXMGG)VsVB^EOF%RX>Ci^Oz9cRY4@^R
zLmI#rl#W35EddCyp!{ibHcdyI;XKw1a1p9L1iHxLfwomM3ODTm8Autc49=kkb-|^&
z&hP3v=Ld^*JI)I$0+Rd}qZgugTDps#?&UzZ80b1byxh8J-Ym9mJwN>6;d|jt7Y|-I
z_`MXmC)Ka;0Wq>HZ~L<K^H#d(9LWDBprBl6x*1qd7K6p+=p}wR)LrN+hI%jYSG<2d
z@CP3wUW_~lJU@Tz23I)nh5KfBL0#Nb4D5a?j8uPd?84a9y@j2Ht^!%;SP0x{>0gp|
z-IaFzy&^Ine;FZmhi?Ky{sSVq74BkqJ1W);hq>E<Az`?U`?k%=7BXL|LOnAsO+M5^
zc8rh9j#6p333ZD2=}ln|ZlWtfV`4iquo~m=T`^PBan&?QYAR=HMm&BUksvsN%o3>r
zAQ)i=AD}-RytDU_)aHy_<yH`T&7UshuIZ~F+UwGJiO#wT0-JU8u#Z0HzEQged<_6}
z0!Vbp-M!r|d3DEtabd+R1#e;tOJdY};_*}_Wya(Ev{#HsKySR<CyR#o6;A92OD?Tt
z$Ph?^n$5EBCIP<|A7^bu+HLXG@zEn>9}@{AK<1w6xF^HgIdVgIXsH4Ek>?W}T-+>0
zaejoIp7XG+P*RUisncgBMrAhv7B&GpFgXZIJFathWPj|HwZPXMYk>_I!SanQSJ|Bf
zzI)1xQD$Ih49=l@9{-YO<6U~+`v#*j=sSfKn~JYYWkx4wRg#z(y)Ks6z}f$zL=MBo
zJ^;8T8D~&sLVxnN<0G`D_B|Y=gT9u<Yqb&Fef(c`OkoK`D-9nIF3BgUqn@ynxq35b
zSGtQC%GkcL0slCxyc7o-@td?cuq6-Gl!a2tY;!1KiTys1pkrkG@CA_lAlH)}Anyd|
z1AxCMi%Vrp0v$t~0MJNe7l2(xeoEKV<Or-4fD;TXcb4ecZ5lD(AwZFw0*C;-1h6&*
z(8L6wkNy%cJ@y7H<yt!1(2U#Z`wh_pmS}3T*|f@rsPuV+FI8!P?DJ3hwA?Sx>WN%h
m8zdUDgR~gi>CX)tHvWM2tO{K?@(3|lJ&JpA*RP0y&F3E)O2%aX

delta 1901
zcmah~O>7fK6rS;V*Y<kt{5VMy2+0NtbWO-_NsBQN0YZTmC&e*BLh8mp8)LEThS{}f
ztcuW9syI|YGy=hm^aN55k&vpMDnJ}^4CMe?ap2Gkw@{>}YE`N8W=Z&ItB&Mv-@G^P
zoA)y_zSsR-GX5eKlMx$V|20`DDRc2wY|d>R?QTUIQ8v5|Wg|NRU`B{UxlU%f=$cL`
z3z{-_Gf(?)0Y@pt7o%}lTL(~2y8{zgp<f2})`yrvV80g^FhW;Q2YnFeqF05w#QT<*
z6S6pU9HD$aLOJoMNav$Xvsob<+!?T>6X3~5PTIkIVdRh*^d*Fj*B|Baug?9iDXq@S
zN|tR9M_DO{8HNT$EA$#?=-)WYO4l$t0g3PtLivvovclPLF3c%}|D~W+p-W-4dl~T2
zW|mW8Q05^-fn_kbYEw}s$|_cPB+NqP-zhwWb_<<o3TrXiA#S9TV&`nFF@4fKZ4Rdk
zc4=mKln|S!wT6^>AYU<!lIq&3Y3EC7EuQY>E7HAud2RjcZW+TpYm-wdcTcG`xnQ4l
z4ASG~3$?npnF1*_qeTf+(hC)cai(fGt|yg@qFpiww1qSPK%Km3u}X+xxq6kDUS#z1
zqA~4OY|9IocDY=!%3h>wxSufDAf9MI^jd^8g8MrFtqiCpZR(J@O^4V$Y&a37S62r~
zP+e+n059i0gY#%Pn23yHdSBW<yDTAfU}4Kb>(b7{i-U`s7tbwi`0TR$L`~jIJyeG-
z2d~6_|D~?=1qw2cr|X9n&MXvv>{x0$c;WDq_ANJR58DSW?Em)26D9FT+3>Tn;hOnS
z+4e~3f1va)jNRFHXUAe-v43&X(m>{sGWI|j`*S%0On*3?ERwHAM(akp(cQ*2z;1aT
z7VZv>;Js<#URq=mE$El3o~`xo1{6&TWHMU7ub(iHFOV3$8`?G71dBufxG<hrm~jn<
zBtdT0b;r%Sm7<<^T~aAjnMK!cA<_cN698}-I7FG?Y-R8b`YjL?`<^S!;yAu0EF<{d
zIC--=Z?ACK*Z3SVV%MGB<`#M>d`aqN?$46+-N^U#L%{nX03=Lg`ZSX4<qcf3I1n#u
zmLCYD;VCSw9$l|k6<61{(Vg-K3WS<@+4b9B$UorHZdfUphDFjKN%`q%!zvNr^@2J(
zK%|R{hcXAo$Sx-GVrar!=jYAsdA-80J=}{ydR4iOTW<HoQg~tyqo_rhNiExYAzwT-
zaX<?bh=K>eHzxaF%J&ubkM7NV^lIZ<fma(l@Hj%o^rv_mPSeM6i<NG!q3!l$-5!kh
z(E0jSgENo(2R%6mhPAB7AvRrOWwIx;Ag63{Hcv`k9P)WJABD9pgY)Pyombjvs^J(*
za;{+<Cyy}oKglFwKsh`ah<rIiqY1)-K9_KNptYXhxJ1J|M+e?7zn`AyR$SBYBH+oz
zV^nS0HVf_4B)?|-WIzx7V)CTm$Y}W4d!UVh+(@>A+yl@H(8s_NDwa#$Jo$wE9r&&G
zf(6?)$zhmh06qnm@HDZfw;RNrArqj?0So{P0zhE?NrY2O0Frd2$=$>aFx6sSNY_ht
zQP(}motb9O6u)w$i(YI__4rqbJHJWjh0~|)Qq?qu$t0tJ8adl(v}N7;6{#JM<L3x)
OWw;M-{uMFcq5KWKkE06!

diff --git a/src/browser/chrome.py b/src/browser/chrome.py
index 964160f..def8c6a 100644
--- a/src/browser/chrome.py
+++ b/src/browser/chrome.py
@@ -1,13 +1,14 @@
-"""Browser chrome (GTK UI)."""
+"""Browser chrome (Adwaita UI)."""
 
 import gi
 from typing import Optional
 import logging
-
-gi.require_version("Gtk", "4.0")
-from gi.repository import Gtk, Gdk, GdkPixbuf
 from functools import partial
 
+gi.require_version("Gtk", "4.0")
+gi.require_version("Adw", "1")
+
+from gi.repository import Gtk, Gdk, GdkPixbuf, Adw
 import skia
 
 
@@ -15,7 +16,7 @@ class Chrome:
     def __init__(self, browser):
         self.logger = logging.getLogger("bowser.chrome")
         self.browser = browser
-        self.window: Optional[Gtk.ApplicationWindow] = None
+        self.window: Optional[Adw.ApplicationWindow] = None
         self.address_bar: Optional[Gtk.Entry] = None
         self.back_btn: Optional[Gtk.Button] = None
         self.forward_btn: Optional[Gtk.Button] = None
@@ -26,46 +27,63 @@ class Chrome:
         self.skia_surface: Optional[skia.Surface] = None
 
     def create_window(self):
-        """Initialize the GTK application window."""
-        self.window = Gtk.ApplicationWindow(application=self.browser.app)
+        """Initialize the Adwaita application window."""
+        # Initialize Adwaita application
+        if not hasattr(self.browser.app, '_adw_init'):
+            Adw.init()
+            self.browser.app._adw_init = True
+        
+        # Create Adwaita window instead of standard GTK window
+        self.window = Adw.ApplicationWindow(application=self.browser.app)
         self.window.set_default_size(1024, 768)
         self.window.set_title("Bowser")
 
-        # Main vertical box
+        # Main vertical box for the window structure
         vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
-        self.window.set_child(vbox)
-
-        # Top bar: address bar + buttons
-        top_bar = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
-        top_bar.set_margin_top(5)
-        top_bar.set_margin_bottom(5)
-        top_bar.set_margin_start(5)
-        top_bar.set_margin_end(5)
+        self.window.set_content(vbox)
 
+        # Header bar with navigation and address bar
+        header_bar = Gtk.HeaderBar()
+        vbox.append(header_bar)
+        
+        # Navigation buttons in header bar
+        nav_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=0)
+        nav_box.add_css_class("linked")
+        
         self.back_btn = Gtk.Button(label="◀")
+        self.back_btn.set_tooltip_text("Back")
         self.forward_btn = Gtk.Button(label="▶")
+        self.forward_btn.set_tooltip_text("Forward")
         self.reload_btn = Gtk.Button(label="⟳")
-
+        self.reload_btn.set_tooltip_text("Reload")
+        
+        nav_box.append(self.back_btn)
+        nav_box.append(self.forward_btn)
+        nav_box.append(self.reload_btn)
+        header_bar.pack_start(nav_box)
+        
+        # Address bar - centered in header
         self.address_bar = Gtk.Entry()
-        self.address_bar.set_text("https://example.com")
+        self.address_bar.set_placeholder_text("Enter URL...")
         self.address_bar.set_hexpand(True)
-
+        self.address_bar.set_max_width_chars(40)
+        header_bar.set_title_widget(self.address_bar)
+        
+        # Go button in header bar end
         self.go_btn = Gtk.Button(label="Go")
-
-        top_bar.append(self.back_btn)
-        top_bar.append(self.forward_btn)
-        top_bar.append(self.reload_btn)
-        top_bar.append(self.address_bar)
-        top_bar.append(self.go_btn)
-
-        vbox.append(top_bar)
+        self.go_btn.add_css_class("suggested-action")
+        header_bar.pack_end(self.go_btn)
 
         # Tabs bar: contains tab buttons and a new-tab button
         self.tabs_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=4)
-        self.tabs_box.set_margin_start(5)
-        self.tabs_box.set_margin_end(5)
-        self.tabs_box.set_margin_bottom(4)
-        vbox.append(self.tabs_box)
+        self.tabs_box.set_margin_start(8)
+        self.tabs_box.set_margin_end(8)
+        self.tabs_box.set_margin_top(6)
+        self.tabs_box.set_margin_bottom(6)
+        
+        tabs_frame = Gtk.Frame()
+        tabs_frame.set_child(self.tabs_box)
+        vbox.append(tabs_frame)
 
         # Drawing area for content
         self.drawing_area = Gtk.DrawingArea()
@@ -74,11 +92,15 @@ class Chrome:
         self.drawing_area.set_draw_func(self.on_draw)
         vbox.append(self.drawing_area)
 
-        # Status bar
+        # Status bar with Adwaita styling
+        status_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=0)
+        status_box.add_css_class("toolbar")
         status_bar = Gtk.Label(label="Ready")
         status_bar.set_xalign(0)
-        status_bar.set_margin_start(5)
-        vbox.append(status_bar)
+        status_bar.set_margin_start(8)
+        status_bar.set_margin_end(8)
+        status_box.append(status_bar)
+        vbox.append(status_box)
 
         self.window.present()
         # Build initial tab bar now that window exists