Skip to content

Redesign top bar + sidebar, add settings (#5) #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvbmir wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Redesign top bar + sidebar, add settings (#5) #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfdff7d
Redesign top bar and sidebar (#5)
mvbmir Apr 17, 2026
48365a8
Address review: extract top-bar layout helpers, leading-pane fallback…
mvbmir Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions rust/limux-host-linux/src/app_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,30 @@ impl ColorScheme {
}
}

#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
pub enum WindowControlsSide {
Left,
#[default]
Right,
}

impl WindowControlsSide {
pub fn as_str(self) -> &'static str {
match self {
Self::Left => "left",
Self::Right => "right",
}
}

fn from_str(s: &str) -> Option<Self> {
match s {
"left" => Some(Self::Left),
"right" => Some(Self::Right),
_ => None,
}
}
}

#[derive(Clone, Debug, Default, PartialEq, Deserialize)]
pub struct AppConfig {
#[serde(default)]
Expand All @@ -45,6 +69,8 @@ pub struct AppConfig {
#[serde(skip)]
pub notifications: NotificationConfig,
#[serde(skip)]
pub interface: InterfaceConfig,
#[serde(skip)]
pub font_size: Option<f32>,
}

Expand All @@ -54,6 +80,23 @@ pub struct AppearanceConfig {
pub ghostty_color_scheme: ColorScheme,
}

#[derive(Clone, Debug, PartialEq, Eq)]
pub struct InterfaceConfig {
pub window_controls_side: WindowControlsSide,
pub show_top_bar: bool,
pub show_workspace_indicators: bool,
}

impl Default for InterfaceConfig {
fn default() -> Self {
Self {
window_controls_side: WindowControlsSide::default(),
show_top_bar: true,
show_workspace_indicators: true,
}
}
}

#[derive(Clone, Debug, Default, PartialEq, Eq, Deserialize)]
pub struct FocusConfig {
#[serde(default)]
Expand Down Expand Up @@ -256,6 +299,24 @@ fn parse_app_config_value(root: &Value) -> AppConfig {
.map(|v| v as f32)
.filter(|v| (1.0..=255.0).contains(v));

let interface_obj = root.get("interface").and_then(Value::as_object);

let window_controls_side = interface_obj
.and_then(|interface| interface.get("window_controls_side"))
.and_then(Value::as_str)
.and_then(WindowControlsSide::from_str)
.unwrap_or_default();

let show_top_bar = interface_obj
.and_then(|interface| interface.get("show_top_bar"))
.and_then(Value::as_bool)
.unwrap_or(true);

let show_workspace_indicators = interface_obj
.and_then(|interface| interface.get("show_workspace_indicators"))
.and_then(Value::as_bool)
.unwrap_or(true);

AppConfig {
focus: FocusConfig {
hover_terminal_focus,
Expand All @@ -268,6 +329,11 @@ fn parse_app_config_value(root: &Value) -> AppConfig {
enabled: notifications_enabled,
sound: notification_sound,
},
interface: InterfaceConfig {
window_controls_side,
show_top_bar,
show_workspace_indicators,
},
font_size,
}
}
Expand Down Expand Up @@ -302,6 +368,14 @@ fn save_to_path(path: &Path, config: &AppConfig) -> Result<(), String> {
"sound": config.notifications.sound.as_str(),
}),
);
root.insert(
"interface".to_string(),
json!({
"window_controls_side": config.interface.window_controls_side.as_str(),
"show_top_bar": config.interface.show_top_bar,
"show_workspace_indicators": config.interface.show_workspace_indicators,
}),
);

if let Some(size) = config.font_size {
root.insert("font_size".to_string(), json!(size));
Expand Down
103 changes: 75 additions & 28 deletions rust/limux-host-linux/src/pane.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use crate::keybind_editor;
use crate::layout_state::{
PaneState, RestorableAgentState, TabContentState, TabState as SavedTabState,
};
use crate::settings_editor;
use crate::shortcut_config::{NormalizedShortcut, ResolvedShortcutConfig, ShortcutId};
use crate::terminal::{self, TerminalCallbacks};

Expand Down Expand Up @@ -201,7 +200,6 @@ type PaneShortcutCaptureCallback =
dyn Fn(ShortcutId, Option<NormalizedShortcut>) -> Result<ResolvedShortcutConfig, String>;
type PaneSplitWithTabCallback = dyn Fn(&gtk::Widget, &gtk::Widget, gtk::Orientation, String, bool);
type PaneConfigCallback = dyn Fn() -> Rc<RefCell<AppConfig>>;
type PaneConfigChangedCallback = dyn Fn(&AppConfig, &AppConfig);
/// Returns the workspace id that owns a given pane widget, or `None` if the
/// pane is not yet attached to a workspace. Used to stamp `LIMUX_WORKSPACE_ID`
/// onto every terminal spawned inside the pane.
Expand All @@ -221,7 +219,6 @@ pub struct PaneCallbacks {
pub on_state_changed: Box<PaneSignalCallback>,
pub on_split_with_tab: Box<PaneSplitWithTabCallback>,
pub current_config: Box<PaneConfigCallback>,
pub on_config_changed: Rc<PaneConfigChangedCallback>,
/// Resolve the workspace id for a given pane widget. May be `None` while
/// the pane is still being constructed; callers treat that as "unknown".
pub workspace_for_pane: Box<PaneWorkspaceLookupCallback>,
Expand Down Expand Up @@ -327,24 +324,25 @@ pub const PANE_CSS: &str = r#"
.limux-tab-close {
background: none;
border: none;
border-radius: 3px;
padding: 1px;
border-radius: 6px;
padding: 2px;
min-height: 0;
min-width: 0;
margin: 0 0 0 4px;
color: alpha(@window_fg_color, 0.28);
margin-left: 4px;
}
.limux-tab-close:hover {
color: alpha(@window_fg_color, 0.8);
background: alpha(@window_fg_color, 0.1);
background: alpha(@window_fg_color, 0.08);
}
.limux-pane-action {
background: none;
border: none;
border-radius: 4px;
padding: 4px 5px;
border-radius: 6px;
padding: 4px;
min-height: 0;
min-width: 0;
margin: 0 1px;
color: alpha(@window_fg_color, 0.4);
}
.limux-pane-action:hover {
Expand Down Expand Up @@ -438,23 +436,44 @@ pub fn create_pane(
.build();
outer.set_size_request(MIN_PANE_WIDTH, MIN_PANE_HEIGHT);

// The single header line: tabs (left) + action icons (right)
// The single header line: [leading slot] tabs (left) + action icons (right)
let header = gtk::Box::builder()
.orientation(gtk::Orientation::Horizontal)
.spacing(0)
.build();
header.add_css_class("limux-pane-header");

// Empty leading slot at the very start of the header — window.rs can
// stash the dock toggle here when the top bar is hidden and the sidebar
// is collapsed. Hidden by default (no children = no width).
let leading_box = gtk::Box::builder()
.orientation(gtk::Orientation::Horizontal)
.spacing(0)
.build();
leading_box.add_css_class("limux-pane-leading");
header.append(&leading_box);

let tab_overlay = gtk::Overlay::new();
tab_overlay.add_css_class("limux-tab-overlay");
tab_overlay.set_hexpand(true);

// tab_strip holds the actual tab buttons (natural width). A WindowHandle
// sibling to its right soaks up the remaining space and drags the window
// when clicked, so the empty area after the last tab is also draggable.
let tab_strip = gtk::Box::builder()
.orientation(gtk::Orientation::Horizontal)
.spacing(0)
.build();
let tab_drag_filler = gtk::WindowHandle::new();
tab_drag_filler.set_hexpand(true);
let tab_strip_wrapper = gtk::Box::builder()
.orientation(gtk::Orientation::Horizontal)
.spacing(0)
.hexpand(true)
.build();
tab_overlay.set_child(Some(&tab_strip));
tab_strip_wrapper.append(&tab_strip);
tab_strip_wrapper.append(&tab_drag_filler);
tab_overlay.set_child(Some(&tab_strip_wrapper));

let drop_indicator = gtk::Box::new(gtk::Orientation::Vertical, 0);
drop_indicator.add_css_class("limux-tab-drop-indicator");
Expand Down Expand Up @@ -507,7 +526,6 @@ pub fn create_pane(
"limux-split-vertical-symbolic",
&pane_action_tooltip(&shortcuts, "Split down", Some(ShortcutId::SplitDown)),
);
let settings_btn = icon_button("emblem-system-symbolic", "Settings");
let close_btn = icon_button(
"window-close-symbolic",
&pane_action_tooltip(&shortcuts, "Close pane", Some(ShortcutId::CloseFocusedPane)),
Expand All @@ -517,7 +535,6 @@ pub fn create_pane(
actions.append(&new_browser_btn);
actions.append(&split_h_btn);
actions.append(&split_v_btn);
actions.append(&settings_btn);
actions.append(&close_btn);

header.append(&tab_overlay);
Expand All @@ -543,6 +560,7 @@ pub fn create_pane(
drop_indicator: drop_indicator.clone(),
content_drop_overlay: content_drop_overlay.clone(),
pane_outer: outer.clone(),
leading_box: leading_box.clone(),
callbacks: callbacks.clone(),
working_directory: ws_wd.clone(),
workspace_dragging: workspace_dragging.clone(),
Expand Down Expand Up @@ -593,21 +611,6 @@ pub fn create_pane(
(cb.on_close_pane)(&pw.clone().upcast());
});
}
{
let internals = internals.clone();
settings_btn.connect_clicked(move |_| {
settings_editor::present_settings_dialog(
&internals.pane_outer,
settings_editor::SettingsEditorInput {
config: (internals.callbacks.current_config)(),
shortcuts: (internals.callbacks.current_shortcuts)(),
on_capture: internals.callbacks.on_capture_shortcut.clone(),
on_config_changed: internals.callbacks.on_config_changed.clone(),
},
);
});
}

install_tab_strip_drop_target(&tab_overlay, &internals);
install_content_drop_target(&internals);

Expand Down Expand Up @@ -863,6 +866,7 @@ pub struct PaneInternals {
drop_indicator: gtk::Box,
content_drop_overlay: gtk::Box,
pane_outer: gtk::Box,
leading_box: gtk::Box,
callbacks: Rc<PaneCallbacks>,
working_directory: Rc<std::cell::RefCell<Option<String>>>,
workspace_dragging: Rc<Cell<bool>>,
Expand Down Expand Up @@ -891,6 +895,7 @@ fn icon_button(icon_name: &str, tooltip: &str) -> gtk::Button {
.icon_name(icon_name)
.tooltip_text(tooltip)
.has_frame(false)
.valign(gtk::Align::Center)
.build();
btn.add_css_class("limux-pane-action");
btn
Expand Down Expand Up @@ -1606,6 +1611,13 @@ fn find_pane_internals(pane_widget: &gtk::Widget) -> Option<Rc<PaneInternals>> {
}
}

/// Returns the leading slot (at the very start of the pane header) so the
/// outer app can place widgets there (e.g. a dock toggle). The box stays
/// empty by default.
pub fn pane_leading_box(pane_widget: &gtk::Widget) -> Option<gtk::Box> {
find_pane_internals(pane_widget).map(|internals| internals.leading_box.clone())
}

pub fn is_pane_widget(widget: &gtk::Widget) -> bool {
let Some(container) = widget.downcast_ref::<gtk::Box>() else {
return false;
Expand All @@ -1616,6 +1628,15 @@ pub fn is_pane_widget(widget: &gtk::Widget) -> bool {
if current.has_css_class("limux-pane-header") {
return true;
}
// The header can be wrapped in a WindowHandle (used so empty space in
// the header drags the window); look through it for the real header.
if let Some(handle) = current.downcast_ref::<gtk::WindowHandle>() {
if let Some(inner) = handle.child() {
if inner.has_css_class("limux-pane-header") {
return true;
}
}
}
child = current.next_sibling();
}

Expand Down Expand Up @@ -1920,6 +1941,7 @@ fn build_tab_button_from_label(
let close_btn = gtk::Button::builder()
.icon_name("window-close-symbolic")
.has_frame(false)
.valign(gtk::Align::Center)
.build();
close_btn.add_css_class("limux-tab-close");

Expand Down Expand Up @@ -1968,6 +1990,31 @@ fn build_tab_button_from_label(
}
tab_btn.add_controller(right_click);

// Middle-click to close the tab.
let middle_click = gtk::GestureClick::new();
middle_click.set_button(2);
{
let tab_id = tab_id.to_string();
let tab_strip = internals.tab_strip.clone();
let content_stack = internals.content_stack.clone();
let tab_state = internals.tab_state.clone();
let callbacks = internals.callbacks.clone();
let pane_outer = internals.pane_outer.clone();
middle_click.connect_pressed(move |gesture, _, _, _| {
gesture.set_state(gtk::EventSequenceState::Claimed);
remove_tab(
&tab_strip,
&content_stack,
&tab_state,
&tab_id,
&callbacks,
&pane_outer,
PaneEmptyReason::ClosedLastTab,
);
});
}
tab_btn.add_controller(middle_click);

let drag_source = gtk::DragSource::new();
drag_source.set_actions(gtk::gdk::DragAction::MOVE);
{
Expand Down
Loading
Loading