Compare commits
3 Commits
feat/tabbe
...
8ed5f104b2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8ed5f104b2 | ||
|
|
cbaa802797 | ||
|
|
e2a1792388 |
@@ -161,6 +161,21 @@ export default class WindowContainer {
|
||||
return this._activeTabIndex;
|
||||
}
|
||||
|
||||
/**
|
||||
* If the given window is a tab in this container, make it the active tab.
|
||||
* Returns true if the window was found and activated.
|
||||
*/
|
||||
focusWindowTab(windowId: number): boolean {
|
||||
if (!this.isTabbed()) return false;
|
||||
|
||||
const index = this._getIndexOfWindow(windowId);
|
||||
if (index !== -1 && index !== this._activeTabIndex) {
|
||||
this.setActiveTab(index);
|
||||
return true;
|
||||
}
|
||||
return index !== -1;
|
||||
}
|
||||
|
||||
hideTabBar(): void {
|
||||
this._tabBar?.hide();
|
||||
}
|
||||
@@ -377,6 +392,13 @@ export default class WindowContainer {
|
||||
this._tabBar.show();
|
||||
}
|
||||
|
||||
/**
|
||||
* Public entry point to refresh tab titles (e.g. when a window title changes).
|
||||
*/
|
||||
refreshTabTitles(): void {
|
||||
this._updateTabBar();
|
||||
}
|
||||
|
||||
/**
|
||||
* Update tab bar state (active highlight, titles) without a full rebuild.
|
||||
*/
|
||||
|
||||
@@ -72,6 +72,19 @@ export default class Monitor {
|
||||
this._workspaces.push(new WindowContainer(this._workArea));
|
||||
}
|
||||
|
||||
focusWindowTab(windowId: number): void {
|
||||
for (const container of this._workspaces) {
|
||||
if (container.focusWindowTab(windowId)) return;
|
||||
}
|
||||
}
|
||||
|
||||
refreshTabTitlesForWindow(winWrap: WindowWrapper): void {
|
||||
const wsId = winWrap.getWorkspace();
|
||||
if (wsId >= 0 && wsId < this._workspaces.length) {
|
||||
this._workspaces[wsId].refreshTabTitles();
|
||||
}
|
||||
}
|
||||
|
||||
hideTabBars(): void {
|
||||
for (const container of this._workspaces) {
|
||||
container.hideTabBar();
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import Clutter from 'gi://Clutter';
|
||||
import Pango from 'gi://Pango';
|
||||
import St from 'gi://St';
|
||||
import * as Main from 'resource:///org/gnome/shell/ui/main.js';
|
||||
import {Logger} from "../utils/logger.js";
|
||||
@@ -25,6 +26,8 @@ export class TabBar {
|
||||
can_focus: false,
|
||||
track_hover: false,
|
||||
});
|
||||
// Force all tabs to equal width regardless of text length
|
||||
(this._bar.layout_manager as Clutter.BoxLayout).homogeneous = true;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -36,19 +39,22 @@ export class TabBar {
|
||||
this._buttons = [];
|
||||
|
||||
items.forEach((item, index) => {
|
||||
const label = new St.Label({
|
||||
text: item.getTabLabel(),
|
||||
style_class: 'aerospike-tab-label',
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
x_expand: true,
|
||||
});
|
||||
label.clutter_text.ellipsize = Pango.EllipsizeMode.END;
|
||||
|
||||
const button = new St.Button({
|
||||
style_class: 'aerospike-tab',
|
||||
reactive: true,
|
||||
can_focus: false,
|
||||
track_hover: true,
|
||||
x_expand: true,
|
||||
child: new St.Label({
|
||||
text: item.getTabLabel(),
|
||||
style_class: 'aerospike-tab-label',
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
x_expand: true,
|
||||
}),
|
||||
child: label,
|
||||
});
|
||||
|
||||
button.connect('clicked', () => {
|
||||
|
||||
@@ -48,7 +48,13 @@ export class WindowWrapper {
|
||||
}
|
||||
|
||||
getTabLabel(): string {
|
||||
const appName = this._window.get_wm_class() ?? '';
|
||||
const rawAppName = this._window.get_wm_class() ?? '';
|
||||
// Strip reverse-domain prefix (e.g. "org.gnome.Nautilus" -> "Nautilus")
|
||||
const lastName = rawAppName.includes('.')
|
||||
? (rawAppName.split('.').pop() ?? rawAppName)
|
||||
: rawAppName;
|
||||
// Capitalize first letter
|
||||
const appName = lastName.charAt(0).toUpperCase() + lastName.slice(1);
|
||||
const title = this._window.get_title() ?? 'Untitled';
|
||||
if (appName && appName.toLowerCase() !== title.toLowerCase()) {
|
||||
return `${appName} | ${title}`;
|
||||
@@ -108,6 +114,9 @@ export class WindowWrapper {
|
||||
this._window.connect("size-changed", () => {
|
||||
windowManager.handleWindowPositionChanged(this);
|
||||
}),
|
||||
this._window.connect('notify::title', () => {
|
||||
windowManager.handleWindowTitleChanged(this);
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -22,6 +22,8 @@ export interface IWindowManager {
|
||||
|
||||
handleWindowPositionChanged(winWrap: WindowWrapper): void;
|
||||
|
||||
handleWindowTitleChanged(winWrap: WindowWrapper): void;
|
||||
|
||||
syncActiveWindow(): number | null;
|
||||
}
|
||||
|
||||
@@ -103,6 +105,7 @@ export default class WindowManager implements IWindowManager {
|
||||
}),
|
||||
global.display.connect("in-fullscreen-changed", () => {
|
||||
Logger.log("IN FULL SCREEN CHANGED");
|
||||
this._syncFullscreenTabBars();
|
||||
}),
|
||||
);
|
||||
|
||||
@@ -419,6 +422,11 @@ export default class WindowManager implements IWindowManager {
|
||||
this._tileMonitors();
|
||||
}
|
||||
|
||||
handleWindowTitleChanged(window: WindowWrapper): void {
|
||||
const mon_id = window._window.get_monitor();
|
||||
this._monitors.get(mon_id)?.refreshTabTitlesForWindow(window);
|
||||
}
|
||||
|
||||
public addWindowToMonitor(window: Meta.Window) {
|
||||
Logger.log("ADDING WINDOW TO MONITOR", window, window);
|
||||
var wrapper = new WindowWrapper(window, (winWrap) => this.handleWindowMinimized(winWrap))
|
||||
@@ -434,6 +442,16 @@ export default class WindowManager implements IWindowManager {
|
||||
}
|
||||
}
|
||||
|
||||
private _syncFullscreenTabBars(): void {
|
||||
for (const [monitorId, monitor] of this._monitors.entries()) {
|
||||
if (global.display.get_monitor_in_fullscreen(monitorId)) {
|
||||
monitor.hideTabBars();
|
||||
} else if (!this._showingOverview) {
|
||||
monitor.showTabBars();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_tileMonitors(): void {
|
||||
this._isTiling = true;
|
||||
try {
|
||||
@@ -486,6 +504,10 @@ export default class WindowManager implements IWindowManager {
|
||||
if (focusWindow) {
|
||||
this._activeWindowId = focusWindow.get_id();
|
||||
Logger.debug(`Active window changed to: ${this._activeWindowId} (${focusWindow.get_title()})`);
|
||||
|
||||
// If the focused window is inside a tabbed container, make it the active tab
|
||||
const monId = focusWindow.get_monitor();
|
||||
this._monitors.get(monId)?.focusWindowTab(this._activeWindowId);
|
||||
} else {
|
||||
this._activeWindowId = null;
|
||||
Logger.debug('No active window');
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
color: rgba(255, 255, 255, 0.5);
|
||||
font-size: 11px;
|
||||
font-weight: 400;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.aerospike-tab:hover {
|
||||
@@ -28,4 +29,5 @@
|
||||
|
||||
.aerospike-tab-label {
|
||||
font-size: 11px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user