Skip to content

fix(settings): align hotkey columns, widen slider rows, one-line hints #412

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

Merged
kirillDevPro merged 1 commit into from
Sep 4, 2026
Merged

fix(settings): align hotkey columns, widen slider rows, one-line hints #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 42 additions & 10 deletions crates/moon-ui-gpui/src/settings/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//!
//! Interface, Lines, and Connections reuse these helpers through re-exports in `settings/mod.rs`.

use std::collections::HashSet;
use std::{collections::HashSet, ops::RangeInclusive};

use gpui::*;
use moon_ui::{
Expand Down Expand Up @@ -57,14 +57,34 @@ pub(super) fn hsla_u8(h: Hsla) -> [u8; 3] {
]
}

/// Build an egui-style labeled slider row with the label above the slider and current value.
/// Build a labeled slider row with a scale below the track and a fixed-width current value.
///
/// The full-width label avoids clipping at large font sizes. Normalize IEEE `-0.0`, which slider
/// quantization over a negative subrange can otherwise display as `-0.00`.
pub(super) fn slider_row(label: &str, st: &Entity<MoonSliderState>, cx: &App) -> impl IntoElement {
/// The full-width label avoids clipping at large font sizes. The caller supplies the slider range
/// because pinned MoonUI keeps it private, plus one formatter so both endpoints and the current
/// value use the field's unit and rounding contract.
///
/// Args:
/// label: Localized caption displayed above the slider.
/// st: Slider state whose current value is displayed.
/// range: Inclusive endpoints displayed below the slider track.
/// format: Field-specific formatter shared by both endpoints and the current value.
/// cx: Application context used for palette and scaled geometry.
///
/// Returns:
/// The assembled label, slider, scale, and current-value row.
pub(super) fn slider_row(
label: &str,
st: &Entity<MoonSliderState>,
range: RangeInclusive<f32>,
format: impl Fn(f32) -> String,
cx: &App,
) -> impl IntoElement {
let p = MoonPalette::active(cx);
let val = st.read(cx).value().end();
let val = if val == 0.0 { 0.0 } else { val };
let min = format(*range.start());
let max = format(*range.end());
let val = format(val);
v_flex()
.w_full()
.child(
Expand All @@ -79,15 +99,27 @@ pub(super) fn slider_row(label: &str, st: &Entity<MoonSliderState>, cx: &App) ->
.gap(design::ui_px(cx, 10.0))
.items_center()
.child(
div()
.w(px(180.0))
.child(MoonSlider::new(st).height(design::ui_value(cx, 22.0))),
v_flex()
.w(design::ui_px(cx, 360.0))
.flex_none()
.child(MoonSlider::new(st).height(design::ui_value(cx, 22.0)))
.child(
h_flex()
.w_full()
.justify_between()
.text_size(design::t_caption(cx))
.text_color(rgba_from(p.text_muted, 1.0))
.child(min)
.child(max),
),
)
.child(
div()
.w(design::font_w_px(cx, 58.0))
.w(design::font_w_px(cx, 76.0))
.flex_none()
.text_align(TextAlign::Right)
.text_color(rgba_from(p.text_muted, 1.0))
.child(format!("{val:.2}")),
.child(val),
),
)
}
Expand Down
101 changes: 89 additions & 12 deletions crates/moon-ui-gpui/src/settings/general.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use gpui::*;
use moon_ui::{
MoonButton, MoonButtonSize, MoonCheckboxSize, MoonInput, MoonInputEvent, MoonInputState,
MoonMenuSize, MoonPalette, MoonSelect, MoonSlider, MoonSliderEvent, MoonSliderState,
MoonToggle, StyledExt, h_flex, rgba_from, v_flex,
MoonToggle, MoonTooltipView, StyledExt, h_flex, rgba_from, v_flex,
};
use rust_i18n::t;

Expand Down Expand Up @@ -53,6 +53,43 @@ fn labeled_select<T: Clone + PartialEq + 'static>(
)
}

/// Render a muted settings hint, shortening multi-sentence text to its first sentence.
///
/// A shortened hint retains its sentence-ending punctuation, adds an ellipsis, and exposes the
/// complete localized text in the standard wide settings tooltip. Text without a sentence
/// boundary is rendered unchanged and does not gain a tooltip.
///
/// Args:
/// key: Stable localization key used as the tooltip host ID.
/// text: Complete localized hint text.
/// muted: Muted text colour from the active MoonUI palette.
///
/// Returns:
/// The hint row, with a tooltip only when the visible text was shortened.
fn settings_hint(key: &'static str, text: &str, muted: Hsla) -> AnyElement {
let sentence_end = [". ", "! ", "? "]
.into_iter()
.filter_map(|boundary| text.find(boundary).map(|index| index + 1))
.min();
let Some(sentence_end) = sentence_end else {
return div()
.text_color(muted)
.child(text.to_string())
.into_any_element();
};

let full = text.to_string();
div()
.id(key)
.text_color(muted)
.child(format!("{} …", &text[..sentence_end]))
.tooltip(move |_window, cx| {
cx.new(|_| MoonTooltipView::new(full.clone()).max_width(420.0))
.into()
})
.into_any_element()
}

impl SettingsView {
/// Adjust the draft log-retention period, clamped to `0..=365` days.
fn adjust_ret(&mut self, delta: i32, cx: &mut Context<Self>) {
Expand Down Expand Up @@ -197,6 +234,12 @@ impl SettingsView {

/// Build the General tab for UI mode/font, locale, chart grouping, control zones,
/// Main-window idle closing, and file-log retention settings.
///
/// Args:
/// cx: Settings context that supplies the active draft and palette.
///
/// Returns:
/// The assembled General-tab content.
pub(super) fn general_tab(&self, cx: &Context<Self>) -> impl IntoElement {
let p = MoonPalette::active(cx);
let muted = rgba_from(p.text_muted, 1.0);
Expand All @@ -212,8 +255,6 @@ impl SettingsView {
d.log_retention_days,
)
};
let hint = |s: &str| div().text_color(muted).child(s.to_string());

// Remember the last valid enabled timeout and restore it when the checkbox is re-enabled.
// The adjustment clamp keeps it at least 5; fall back to the default defensively.
if idle_secs >= 5 {
Expand Down Expand Up @@ -277,13 +318,25 @@ impl SettingsView {
}
})),
)
.child(hint(&t!("iface.light_theme_hint")))
.child(settings_hint(
"iface.light_theme_hint",
&t!("iface.light_theme_hint"),
muted,
))
.child(self.font_delta_control(cx))
.child(hint(&t!("iface.font_delta_hint")))
.child(settings_hint(
"iface.font_delta_hint",
&t!("iface.font_delta_hint"),
muted,
))
.child(super::separator(p, cx))
// Interface locale selector.
.child(labeled_select("general.language", &self.lang, 220.0, cx))
.child(hint(&t!("general.language_hint")))
.child(settings_hint(
"general.language_hint",
&t!("general.language_hint"),
muted,
))
.child(super::separator(p, cx))
// Which rate converts quote money to USDT. The hint explains the two limitations of
// the current-rate conversion at the point where the application-wide choice is made.
Expand All @@ -293,7 +346,11 @@ impl SettingsView {
260.0,
cx,
))
.child(hint(&t!("general.valuation_mode_hint")))
.child(settings_hint(
"general.valuation_mode_hint",
&t!("general.valuation_mode_hint"),
muted,
))
.child(super::separator(p, cx))
// Place each core in a separate chart tab.
.child(
Expand All @@ -308,7 +365,11 @@ impl SettingsView {
.label(t!("general.charts_split_by_core").to_string())
.size(MoonCheckboxSize::Normal),
)
.child(hint(&t!("general.charts_split_by_core_hint")))
.child(settings_hint(
"general.charts_split_by_core_hint",
&t!("general.charts_split_by_core_hint"),
muted,
))
.child(super::separator(p, cx))
// Restrict order and line controls to the order-book control zone.
.child(
Expand All @@ -323,7 +384,11 @@ impl SettingsView {
.label(t!("general.separate_control_zones").to_string())
.size(MoonCheckboxSize::Normal),
)
.child(hint(&t!("general.separate_control_zones_hint")))
.child(settings_hint(
"general.separate_control_zones_hint",
&t!("general.separate_control_zones_hint"),
muted,
))
.child(super::separator(p, cx))
// Close Main charts after window inactivity; zero disables the timeout.
.child(
Expand Down Expand Up @@ -369,7 +434,11 @@ impl SettingsView {
Self::adjust_idle,
)),
)
.child(hint(&t!("general.main_idle_close_hint")))
.child(settings_hint(
"general.main_idle_close_hint",
&t!("general.main_idle_close_hint"),
muted,
))
.child(super::separator(p, cx))
// Stack layout is now configured per tab from the chart-tabs layout popup.
// File logging and retention period.
Expand All @@ -385,7 +454,11 @@ impl SettingsView {
.label(t!("general.log_to_file").to_string())
.size(MoonCheckboxSize::Normal),
)
.child(hint(&t!("general.log_to_file_hint")))
.child(settings_hint(
"general.log_to_file_hint",
&t!("general.log_to_file_hint"),
muted,
))
// Retention controls are enabled only while file logging is enabled; otherwise the
// buttons are disabled and the value and labels are muted.
.child(
Expand All @@ -407,7 +480,11 @@ impl SettingsView {
Self::adjust_ret,
)),
)
.child(hint(&t!("general.log_retention_hint")))
.child(settings_hint(
"general.log_retention_hint",
&t!("general.log_retention_hint"),
muted,
))
// Launch and servers.enc passwords. Last on the tab: it is the only block that can lock
// the user out of their own cores, so it should not be the first thing a hand lands on.
.child(super::separator(p, cx))
Expand Down
Loading