c89d890 fix(omnibox): center in-pane omnibox and show 5 of 10 scrollable results · dumber

M internal/ui/component/modal_sizing.go +5 -4


@@ -43,19 +43,20 @@ var DefaultRowHeights = RowHeightDefaults{
43	43		}
44	44
45	45		// OmniboxSizeDefaults provides default sizing for omnibox modal.
	46	+	// The in-pane omnibox is vertically centered, so it has no top margin.
46	47		var OmniboxSizeDefaults = ModalSizeConfig{
47	48		WidthPct: 0.8,
48	49		MaxWidth: 800,
49		-	TopMarginPct: 0.2,
50	50		FallbackWidth: 800,
51	51		FallbackHeight: 600,
52	52		}
53	53
54		-	// OmniboxListDefaults provides display limits for omnibox modal.
	54	+	// OmniboxListDefaults provides display limits for omnibox modal:
	55	+	// MaxResults rows are listed and navigable, MaxVisibleRows fit before scrolling.
55	56		var OmniboxListDefaults = ListDisplayDefaults{
56		-	MaxVisibleRows: 10,
	57	+	MaxVisibleRows: 5,
57	58		MaxResults: 10,
58		-	SmallMaxVisibleRows: 5,
	59	+	SmallMaxVisibleRows: 3,
59	60		}
60	61
61	62		// SessionManagerSizeDefaults provides default sizing for session manager modal.

 }
 // OmniboxSizeDefaults provides default sizing for omnibox modal.
+// The in-pane omnibox is vertically centered, so it has no top margin.
 var OmniboxSizeDefaults = ModalSizeConfig{
 	WidthPct:       0.8,
 	MaxWidth:       800,
-	TopMarginPct:   0.2,
 	FallbackWidth:  800,
 	FallbackHeight: 600,
 }
-// OmniboxListDefaults provides display limits for omnibox modal.
+// OmniboxListDefaults provides display limits for omnibox modal:
+// MaxResults rows are listed and navigable, MaxVisibleRows fit before scrolling.
 var OmniboxListDefaults = ListDisplayDefaults{
-	MaxVisibleRows:      10,
+	MaxVisibleRows:      5,
 	MaxResults:          10,
-	SmallMaxVisibleRows: 5,
+	SmallMaxVisibleRows: 3,
 }
 // SessionManagerSizeDefaults provides default sizing for session manager modal.

M internal/ui/component/modal_sizing_test.go +15 -3


@@ -5,6 +5,7 @@ import (
5	5		"testing"
6	6
7	7		layoutmocks "github.com/bnema/dumber/internal/ui/layout/mocks"
	8	+	"github.com/bnema/puregotk/v4/gtk"
8	9		"github.com/stretchr/testify/assert"
9	10		)
10	11

@@ -168,10 +169,21 @@ func TestDefaultRowHeights_Values(t *testing.T) {
168	169		func TestOmniboxSizeDefaults_Values(t *testing.T) {
169	170		assert.InDelta(t, 0.8, OmniboxSizeDefaults.WidthPct, 0.0001)
170	171		assert.Equal(t, 800, OmniboxSizeDefaults.MaxWidth)
171		-	assert.InDelta(t, 0.2, OmniboxSizeDefaults.TopMarginPct, 0.0001)
	172	+	assert.Zero(t, OmniboxSizeDefaults.TopMarginPct)
172	173		assert.Equal(t, 600, OmniboxSizeDefaults.FallbackHeight)
173	174		}
174	175
	176	+	func TestOmniboxValign(t *testing.T) {
	177	+	assert.Equal(t, gtk.AlignCenterValue, omniboxValign(OmniboxSizeDefaults))
	178	+	assert.Equal(t, gtk.AlignStartValue, omniboxValign(ModalSizeConfig{UseFixedTopMargin: true}))
	179	+	}
	180	+
	181	+	func TestOmniboxListDefaults_ShowFiveScrollTen(t *testing.T) {
	182	+	assert.Equal(t, 5, OmniboxListDefaults.MaxVisibleRows)
	183	+	assert.Equal(t, 10, OmniboxListDefaults.MaxResults)
	184	+	assert.Less(t, OmniboxListDefaults.SmallMaxVisibleRows, OmniboxListDefaults.MaxVisibleRows)
	185	+	}
	186	+
175	187		func TestSessionManagerSizeDefaults_Values(t *testing.T) {
176	188		assert.Greater(t, SessionManagerSizeDefaults.WidthPct, 0.0)
177	189		assert.LessOrEqual(t, SessionManagerSizeDefaults.WidthPct, 1.0)

@@ -325,7 +337,7 @@ func TestCalculateModalDimensionsWithScale_LargeParent(t *testing.T) {
325	337		parent := mockParent(t, 3000, 1200)
326	338		w, m := CalculateModalDimensionsWithScale(parent, cfg, tt.scale)
327	339		assert.Equal(t, tt.want, w, "scale %v", tt.scale)
328		-	assert.Equal(t, 240, m, "top margin unchanged")
	340	+	assert.Zero(t, m, "omnibox is centered, not top-margined")
329	341		}
330	342		}
331	343

@@ -351,7 +363,7 @@ func TestCalculateModalDimensionsWithScale_NormalizesBadScale(t *testing.T) {
351	363		parent := mockParent(t, 3000, 1080)
352	364		w, m := CalculateModalDimensionsWithScale(parent, cfg, scale)
353	365		assert.Equal(t, 800, w, "scale %v", scale)
354		-	assert.Equal(t, 216, m, "scale %v", scale)
	366	+	assert.Zero(t, m, "scale %v", scale)
355	367		}
356	368		}
357	369

 	"testing"
 	layoutmocks "github.com/bnema/dumber/internal/ui/layout/mocks"
+	"github.com/bnema/puregotk/v4/gtk"
 	"github.com/stretchr/testify/assert"
 )
 func TestOmniboxSizeDefaults_Values(t *testing.T) {
 	assert.InDelta(t, 0.8, OmniboxSizeDefaults.WidthPct, 0.0001)
 	assert.Equal(t, 800, OmniboxSizeDefaults.MaxWidth)
-	assert.InDelta(t, 0.2, OmniboxSizeDefaults.TopMarginPct, 0.0001)
+	assert.Zero(t, OmniboxSizeDefaults.TopMarginPct)
 	assert.Equal(t, 600, OmniboxSizeDefaults.FallbackHeight)
 }
+func TestOmniboxValign(t *testing.T) {
+	assert.Equal(t, gtk.AlignCenterValue, omniboxValign(OmniboxSizeDefaults))
+	assert.Equal(t, gtk.AlignStartValue, omniboxValign(ModalSizeConfig{UseFixedTopMargin: true}))
+}
+func TestOmniboxListDefaults_ShowFiveScrollTen(t *testing.T) {
+	assert.Equal(t, 5, OmniboxListDefaults.MaxVisibleRows)
+	assert.Equal(t, 10, OmniboxListDefaults.MaxResults)
+	assert.Less(t, OmniboxListDefaults.SmallMaxVisibleRows, OmniboxListDefaults.MaxVisibleRows)
+}
 func TestSessionManagerSizeDefaults_Values(t *testing.T) {
 	assert.Greater(t, SessionManagerSizeDefaults.WidthPct, 0.0)
 	assert.LessOrEqual(t, SessionManagerSizeDefaults.WidthPct, 1.0)
 		parent := mockParent(t, 3000, 1200)
 		w, m := CalculateModalDimensionsWithScale(parent, cfg, tt.scale)
 		assert.Equal(t, tt.want, w, "scale %v", tt.scale)
-		assert.Equal(t, 240, m, "top margin unchanged")
+		assert.Zero(t, m, "omnibox is centered, not top-margined")
 	}
 }
 		parent := mockParent(t, 3000, 1080)
 		w, m := CalculateModalDimensionsWithScale(parent, cfg, scale)
 		assert.Equal(t, 800, w, "scale %v", scale)
-		assert.Equal(t, 216, m, "scale %v", scale)
+		assert.Zero(t, m, "scale %v", scale)
 	}
 }

M internal/ui/component/omnibox.go +46 -12


@@ -776,12 +776,21 @@ func (o *Omnibox) initOuterBox() error {
776	776		return errNilWidget("outerBox")
777	777		}
778	778		o.outerBox.AddCssClass("omnibox-outer")
779		-	o.outerBox.SetHalign(gtk.AlignCenterValue) // Center horizontally
780		-	o.outerBox.SetValign(gtk.AlignStartValue) // Align to top
781		-	o.outerBox.SetVisible(false) // Hidden by default
	779	+	o.outerBox.SetHalign(gtk.AlignCenterValue)
	780	+	o.outerBox.SetValign(omniboxValign(o.sizeCfg))
	781	+	o.outerBox.SetVisible(false) // Hidden by default
782	782		return nil
783	783		}
784	784
	785	+	// omniboxValign centers the in-pane omnibox vertically; a fixed top margin
	786	+	// (standalone window sized by its content) keeps it top-aligned.
	787	+	func omniboxValign(cfg ModalSizeConfig) gtk.Align {
	788	+	if cfg.UseFixedTopMargin {
	789	+	return gtk.AlignStartValue
	790	+	}
	791	+	return gtk.AlignCenterValue
	792	+	}
	793	+
785	794		func (o *Omnibox) initMainBox() error {
786	795		o.mainBox = gtk.NewBox(gtk.OrientationVerticalValue, 0)
787	796		if o.mainBox == nil {

@@ -923,7 +932,7 @@ func (o *Omnibox) initList() error {
923	932		return
924	933		}
925	934
926		-	targetURL := resolveTargetURLForSelection(mode, idx, o.effectiveMaxRows(), suggestions, favorites)
	935	+	targetURL := resolveTargetURLForSelection(mode, idx, OmniboxListDefaults.MaxResults, suggestions, favorites)
927	936
928	937		if targetURL != "" {
929	938		o.submitNavigation(targetURL)

@@ -1503,7 +1512,7 @@ func (o *Omnibox) restoreEntryToRealInput() {
1503	1512		// updateGhostFromSelectionWithInput updates ghost text based on selected row and input.
1504	1513		func (o *Omnibox) updateGhostFromSelectionWithInput(entryText string) {
1505	1514		log := logging.FromContext(o.ctx)
1506		-	maxVisible := o.effectiveMaxRows()
	1515	+	maxVisible := OmniboxListDefaults.MaxResults
1507	1516		o.mu.RLock()
1508	1517		idx := o.selectedIndex
1509	1518		mode := o.viewMode

@@ -1632,7 +1641,7 @@ func (o *Omnibox) performSearch() {
1632	1641		}
1633	1642
1634	1643		// Perform fuzzy history search in background
1635		-	o.searchHistory(query, o.effectiveMaxRows(), token)
	1644	+	o.searchHistory(query, OmniboxListDefaults.MaxResults, token)
1636	1645		}
1637	1646
1638	1647		// searchHistory runs a fuzzy history search in a background goroutine.

@@ -1706,7 +1715,7 @@ func (o *Omnibox) loadInitialHistory(token uint64) {
1706	1715
1707	1716		// Capture effective result limit and age window on the GTK main thread
1708	1717		// before spawning goroutine.
1709		-	initialLimit := o.effectiveMaxRows()
	1718	+	initialLimit := OmniboxListDefaults.MaxResults
1710	1719		initialBehavior := o.initialBehavior
1711	1720		maxHistoryDays := o.maxHistoryDays
1712	1721

@@ -1962,8 +1971,13 @@ func (o *Omnibox) updateFavorites(favorites []Favorite, query string) {
1962	1971
1963	1972		// rebuildList rebuilds the ListBox contents.
1964	1973		func (o *Omnibox) rebuildList() {
1965		-	// Clear existing rows
	1974	+	// Clear existing rows and show new results from the top
1966	1975		o.listBox.RemoveAll()
	1976	+	if o.scrolledWin != nil {
	1977	+	if adj := o.scrolledWin.GetVadjustment(); adj != nil {
	1978	+	adj.SetValue(0)
	1979	+	}
	1980	+	}
1967	1981
1968	1982		o.mu.RLock()
1969	1983		mode := o.viewMode

@@ -2253,19 +2267,39 @@ func (o *Omnibox) selectIndex(index int) {
2253	2267		row := o.listBox.GetRowAtIndex(index)
2254	2268		if row != nil {
2255	2269		o.listBox.SelectRow(row)
	2270	+	o.scrollRowIntoView(row)
2256	2271		return
2257	2272		}
2258	2273
2259	2274		o.updateGhostFromSelection()
2260	2275		}
2261	2276
	2277	+	// scrollRowIntoView scrolls the results list so the row is fully visible.
	2278	+	// The entry keeps keyboard focus, so GTK does not scroll the list itself.
	2279	+	func (o Omnibox) scrollRowIntoView(row gtk.ListBoxRow) {
	2280	+	if o.scrolledWin == nil \|\| row == nil {
	2281	+	return
	2282	+	}
	2283	+	adj := o.scrolledWin.GetVadjustment()
	2284	+	if adj == nil {
	2285	+	return
	2286	+	}
	2287	+	src := &graphene.Point{}
	2288	+	out := &graphene.Point{}
	2289	+	if !row.ComputePoint(&o.listBox.Widget, src, out) {
	2290	+	return
	2291	+	}
	2292	+	top := float64(out.Y)
	2293	+	adj.ClampPage(top, top+float64(row.GetAllocatedHeight()))
	2294	+	}
	2295	+
2262	2296		// selectNext moves selection down.
2263	2297		func (o *Omnibox) selectNext() {
2264	2298		o.mu.Lock()
2265	2299		current := o.selectedIndex
2266	2300		mode := o.viewMode
2267	2301		bangMode := o.bangMode
2268		-	maxVisible := o.effectiveMaxRows()
	2302	+	maxVisible := OmniboxListDefaults.MaxResults
2269	2303		var maxIndex int
2270	2304		if bangMode {
2271	2305		maxIndex = visibleResultCount(len(o.bangSuggestions), maxVisible) - 1

@@ -2294,7 +2328,7 @@ func (o *Omnibox) selectPrevious() {
2294	2328		current := o.selectedIndex
2295	2329		mode := o.viewMode
2296	2330		bangMode := o.bangMode
2297		-	maxVisible := o.effectiveMaxRows()
	2331	+	maxVisible := OmniboxListDefaults.MaxResults
2298	2332		var maxIndex int
2299	2333		if bangMode {
2300	2334		maxIndex = visibleResultCount(len(o.bangSuggestions), maxVisible) - 1

@@ -2327,7 +2361,7 @@ func (o *Omnibox) selectAndNavigate(index int) {
2327	2361		suggestions := o.suggestions
2328	2362		favorites := o.favorites
2329	2363		o.mu.RUnlock()
2330		-	maxVisible := o.effectiveMaxRows()
	2364	+	maxVisible := OmniboxListDefaults.MaxResults
2331	2365
2332	2366		if bangMode {
2333	2367		o.navigateToSelected()

@@ -2400,7 +2434,7 @@ func (o *Omnibox) navigateToSelected() {
2400	2434		var targetURL string
2401	2435		if idx >= 0 {
2402	2436		// If user has selected a result, navigate to that result.
2403		-	targetURL = resolveTargetURLForSelection(mode, idx, o.effectiveMaxRows(), suggestions, favorites)
	2437	+	targetURL = resolveTargetURLForSelection(mode, idx, OmniboxListDefaults.MaxResults, suggestions, favorites)
2404	2438		} else {
2405	2439		targetURL = o.buildURL(entryText)
2406	2440		}

 		return errNilWidget("outerBox")
 	}
 	o.outerBox.AddCssClass("omnibox-outer")
-	o.outerBox.SetHalign(gtk.AlignCenterValue) // Center horizontally
+	o.outerBox.SetHalign(gtk.AlignCenterValue)
-	o.outerBox.SetValign(gtk.AlignStartValue)  // Align to top
+	o.outerBox.SetValign(omniboxValign(o.sizeCfg))
-	o.outerBox.SetVisible(false)               // Hidden by default
+	o.outerBox.SetVisible(false) // Hidden by default
 	return nil
 }
+// omniboxValign centers the in-pane omnibox vertically; a fixed top margin
+// (standalone window sized by its content) keeps it top-aligned.
+func omniboxValign(cfg ModalSizeConfig) gtk.Align {
+	if cfg.UseFixedTopMargin {
+		return gtk.AlignStartValue
+	}
+	return gtk.AlignCenterValue
+}
 func (o *Omnibox) initMainBox() error {
 	o.mainBox = gtk.NewBox(gtk.OrientationVerticalValue, 0)
 	if o.mainBox == nil {
 			return
 		}
-		targetURL := resolveTargetURLForSelection(mode, idx, o.effectiveMaxRows(), suggestions, favorites)
+		targetURL := resolveTargetURLForSelection(mode, idx, OmniboxListDefaults.MaxResults, suggestions, favorites)
 		if targetURL != "" {
 			o.submitNavigation(targetURL)
 // updateGhostFromSelectionWithInput updates ghost text based on selected row and input.
 func (o *Omnibox) updateGhostFromSelectionWithInput(entryText string) {
 	log := logging.FromContext(o.ctx)
-	maxVisible := o.effectiveMaxRows()
+	maxVisible := OmniboxListDefaults.MaxResults
 	o.mu.RLock()
 	idx := o.selectedIndex
 	mode := o.viewMode
 	}
 	// Perform fuzzy history search in background
-	o.searchHistory(query, o.effectiveMaxRows(), token)
+	o.searchHistory(query, OmniboxListDefaults.MaxResults, token)
 }
 // searchHistory runs a fuzzy history search in a background goroutine.
 	// Capture effective result limit and age window on the GTK main thread
 	// before spawning goroutine.
-	initialLimit := o.effectiveMaxRows()
+	initialLimit := OmniboxListDefaults.MaxResults
 	initialBehavior := o.initialBehavior
 	maxHistoryDays := o.maxHistoryDays
 // rebuildList rebuilds the ListBox contents.
 func (o *Omnibox) rebuildList() {
-	// Clear existing rows
+	// Clear existing rows and show new results from the top
 	o.listBox.RemoveAll()
+	if o.scrolledWin != nil {
+		if adj := o.scrolledWin.GetVadjustment(); adj != nil {
+			adj.SetValue(0)
+		}
+	}
 	o.mu.RLock()
 	mode := o.viewMode
 	row := o.listBox.GetRowAtIndex(index)
 	if row != nil {
 		o.listBox.SelectRow(row)
+		o.scrollRowIntoView(row)
 		return
 	}
 	o.updateGhostFromSelection()
 }
+// scrollRowIntoView scrolls the results list so the row is fully visible.
+// The entry keeps keyboard focus, so GTK does not scroll the list itself.
+func (o *Omnibox) scrollRowIntoView(row *gtk.ListBoxRow) {
+	if o.scrolledWin == nil || row == nil {
+		return
+	}
+	adj := o.scrolledWin.GetVadjustment()
+	if adj == nil {
+		return
+	}
+	src := &graphene.Point{}
+	out := &graphene.Point{}
+	if !row.ComputePoint(&o.listBox.Widget, src, out) {
+		return
+	}
+	top := float64(out.Y)
+	adj.ClampPage(top, top+float64(row.GetAllocatedHeight()))
+}
 // selectNext moves selection down.
 func (o *Omnibox) selectNext() {
 	o.mu.Lock()
 	current := o.selectedIndex
 	mode := o.viewMode
 	bangMode := o.bangMode
-	maxVisible := o.effectiveMaxRows()
+	maxVisible := OmniboxListDefaults.MaxResults
 	var maxIndex int
 	if bangMode {
 		maxIndex = visibleResultCount(len(o.bangSuggestions), maxVisible) - 1
 	current := o.selectedIndex
 	mode := o.viewMode
 	bangMode := o.bangMode
-	maxVisible := o.effectiveMaxRows()
+	maxVisible := OmniboxListDefaults.MaxResults
 	var maxIndex int
 	if bangMode {
 		maxIndex = visibleResultCount(len(o.bangSuggestions), maxVisible) - 1
 	suggestions := o.suggestions
 	favorites := o.favorites
 	o.mu.RUnlock()
-	maxVisible := o.effectiveMaxRows()
+	maxVisible := OmniboxListDefaults.MaxResults
 	if bangMode {
 		o.navigateToSelected()
 	var targetURL string
 	if idx >= 0 {
 		// If user has selected a result, navigate to that result.
-		targetURL = resolveTargetURLForSelection(mode, idx, o.effectiveMaxRows(), suggestions, favorites)
+		targetURL = resolveTargetURLForSelection(mode, idx, OmniboxListDefaults.MaxResults, suggestions, favorites)
 	} else {
 		targetURL = o.buildURL(entryText)
 	}

M internal/ui/component/omnibox_initial_behavior_test.go +1 -1


@@ -287,7 +287,7 @@ func TestOmniboxLoadInitialHistory_MostVisitedBoundsSQL(t *testing.T) {
287	287		repo := repomocks.NewMockHistoryRepository(t)
288	288		done := make(chan struct{})
289	289		repo.EXPECT().
290		-	GetMostVisitedWithin(mock.Anything, OmniboxListDefaults.MaxVisibleRows, mock.Anything).
	290	+	GetMostVisitedWithin(mock.Anything, OmniboxListDefaults.MaxResults, mock.Anything).
291	291		Run(func(context.Context, int, repository.HistoryScope) { close(done) }).
292	292		Return([]*entity.HistoryEntry{{URL: "https://example.com"}}, nil)
293	293


@@ -287,7 +287,7 @@ func TestOmniboxLoadInitialHistory_MostVisitedBoundsSQL(t *testing.T) {
287		repo := repomocks.NewMockHistoryRepository(t)	287		repo := repomocks.NewMockHistoryRepository(t)
288		done := make(chan struct{})	288		done := make(chan struct{})
289		repo.EXPECT().	289		repo.EXPECT().
290	-	GetMostVisitedWithin(mock.Anything, OmniboxListDefaults.MaxVisibleRows, mock.Anything).	290	+	GetMostVisitedWithin(mock.Anything, OmniboxListDefaults.MaxResults, mock.Anything).
291		Run(func(context.Context, int, repository.HistoryScope) { close(done) }).	291		Run(func(context.Context, int, repository.HistoryScope) { close(done) }).
292		Return([]*entity.HistoryEntry{{URL: "https://example.com"}}, nil)	292		Return([]*entity.HistoryEntry{{URL: "https://example.com"}}, nil)
293			293