merge(main): resolve conflicts in CHANGELOG and workspace_css

commit: 9f4ac34e8dde9324360d2baa84c812b9ebcc1306
author: bnema · 10mo ago · 2025-11-29 17:13 UTC
merge of: 31d7d6f + 0acf729 · diff against the first parent
signature: GPG Unverified2B82207D370127A0 The key is unknown

2 files · +16 -9

M internal/app/browser/tab_manager.go +7 -0


@@ -41,6 +41,13 @@ type TabManager struct {
41	41		renamePrevFocusOnClick bool
42	42		renamePrevCanFocus bool
43	43
	44	+	// Rename state
	45	+	renameInProgress bool
	46	+	renamingTab *Tab
	47	+	// Stores original focus behaviour while inline rename is active
	48	+	renamePrevFocusOnClick bool
	49	+	renamePrevCanFocus bool
	50	+
44	51		// Tab button click handling (pattern from StackedPaneManager)
45	52		buttonToTab map[uint64]*Tab // Maps button ID to tab for click handling
46	53		nextButtonID uint64 // Atomic counter for generating unique button IDs


@@ -41,6 +41,13 @@ type TabManager struct {
41	renamePrevFocusOnClick bool	41		renamePrevFocusOnClick bool
42	renamePrevCanFocus bool	42		renamePrevCanFocus bool
43		43
		44	+	// Rename state
		45	+	renameInProgress bool
		46	+	renamingTab *Tab
		47	+	// Stores original focus behaviour while inline rename is active
		48	+	renamePrevFocusOnClick bool
		49	+	renamePrevCanFocus bool
		50	+
44	// Tab button click handling (pattern from StackedPaneManager)	51		// Tab button click handling (pattern from StackedPaneManager)
45	buttonToTab map[uint64]*Tab // Maps button ID to tab for click handling	52		buttonToTab map[uint64]*Tab // Maps button ID to tab for click handling
46	nextButtonID uint64 // Atomic counter for generating unique button IDs	53		nextButtonID uint64 // Atomic counter for generating unique button IDs

M internal/app/browser/workspace_css.go +9 -9


@@ -360,15 +360,15 @@ func (wm *WorkspaceManager) generateWorkspaceCSS() string {
360	360		titleFontSize, // tab-title font-size
361	361		getStackTitleTextColor(isDark), // tab-title color
362	362		// Tab rename entry styles
363		-	getEntryBg(isDark), // entry.tab-rename-entry background
364		-	getStackTitleTextColor(isDark), // entry.tab-rename-entry color (text)
365		-	titleFontSize, // entry.tab-rename-entry font-size
366		-	titlePaddingHorizontal, // entry.tab-rename-entry padding horizontal (vertical is hardcoded 2px)
367		-	getEntryBorderColor(isDark), // entry.tab-rename-entry border-color
368		-	getEntryFocusBg(isDark), // entry.tab-rename-entry:focus background
369		-	activeBorderColor, // entry.tab-rename-entry:focus border-color (use active pane color)
370		-	windowBackgroundColor, // tab-content-area background
371		-	windowBackgroundColor, // tab-workspace-container background
	363	+	getEntryBg(isDark), // entry.tab-rename-entry background
	364	+	getStackTitleTextColor(isDark), // entry.tab-rename-entry color (text)
	365	+	titleFontSize, // entry.tab-rename-entry font-size
	366	+	titlePaddingHorizontal, // entry.tab-rename-entry padding horizontal (vertical is hardcoded 2px)
	367	+	getEntryBorderColor(isDark), // entry.tab-rename-entry border-color
	368	+	getEntryFocusBg(isDark), // entry.tab-rename-entry:focus background
	369	+	activeBorderColor, // entry.tab-rename-entry:focus border-color (use active pane color)
	370	+	windowBackgroundColor, // tab-content-area background
	371	+	windowBackgroundColor, // tab-workspace-container background
372	372		)
373	373
374	374		return css


@@ -360,15 +360,15 @@ func (wm *WorkspaceManager) generateWorkspaceCSS() string {
360		titleFontSize, // tab-title font-size	360		titleFontSize, // tab-title font-size
361		getStackTitleTextColor(isDark), // tab-title color	361		getStackTitleTextColor(isDark), // tab-title color
362		// Tab rename entry styles	362		// Tab rename entry styles
363	-	getEntryBg(isDark), // entry.tab-rename-entry background	363	+	getEntryBg(isDark), // entry.tab-rename-entry background
364	-	getStackTitleTextColor(isDark), // entry.tab-rename-entry color (text)	364	+	getStackTitleTextColor(isDark), // entry.tab-rename-entry color (text)
365	-	titleFontSize, // entry.tab-rename-entry font-size	365	+	titleFontSize, // entry.tab-rename-entry font-size
366	-	titlePaddingHorizontal, // entry.tab-rename-entry padding horizontal (vertical is hardcoded 2px)	366	+	titlePaddingHorizontal, // entry.tab-rename-entry padding horizontal (vertical is hardcoded 2px)
367	-	getEntryBorderColor(isDark), // entry.tab-rename-entry border-color	367	+	getEntryBorderColor(isDark), // entry.tab-rename-entry border-color
368	-	getEntryFocusBg(isDark), // entry.tab-rename-entry:focus background	368	+	getEntryFocusBg(isDark), // entry.tab-rename-entry:focus background
369	-	activeBorderColor, // entry.tab-rename-entry:focus border-color (use active pane color)	369	+	activeBorderColor, // entry.tab-rename-entry:focus border-color (use active pane color)
370	-	windowBackgroundColor, // tab-content-area background	370	+	windowBackgroundColor, // tab-content-area background
371	-	windowBackgroundColor, // tab-workspace-container background	371	+	windowBackgroundColor, // tab-workspace-container background
372		)	372		)
373			373
374		return css	374		return css