Skip to content

Expose full config surface in configurator #81

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
devmobasa merged 2 commits into from
Dec 29, 2025
Merged

Expose full config surface in configurator #81

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
29f5374
Expose full config surface in configurator
devmobasa Dec 29, 2025
810d0ce
Merge main into configurator-sync
devmobasa Dec 29, 2025
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
290 changes: 285 additions & 5 deletions configurator/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ use wayscriber::config::Config;

use crate::messages::Message;
use crate::models::{
BoardModeOption, ColorMode, ColorQuadInput, ColorTripletInput, ConfigDraft, FontStyleOption,
FontWeightOption, NamedColorOption, OverrideOption, QuadField, SessionCompressionOption,
SessionStorageModeOption, StatusPositionOption, TabId, TextField, ToggleField,
ToolbarLayoutModeOption, ToolbarOverrideField, TripletField, UiTabId,
BoardModeOption, ColorMode, ColorQuadInput, ColorTripletInput, ConfigDraft, EraserModeOption,
FontStyleOption, FontWeightOption, NamedColorOption, OverrideOption, QuadField,
SessionCompressionOption, SessionStorageModeOption, StatusPositionOption, TabId, TextField,
ToggleField, ToolbarLayoutModeOption, ToolbarOverrideField, TripletField, UiTabId,
};

pub fn run() -> iced::Result {
Expand Down Expand Up @@ -271,6 +271,11 @@ impl Application for ConfiguratorApp {
}
self.refresh_dirty_flag();
}
Message::EraserModeChanged(option) => {
self.status = StatusMessage::idle();
self.draft.drawing_default_eraser_mode = option;
self.refresh_dirty_flag();
}
Message::StatusPositionChanged(option) => {
self.status = StatusMessage::idle();
self.draft.ui_status_position = option;
Expand Down Expand Up @@ -428,12 +433,14 @@ impl ConfiguratorApp {
let content: Element<'_, Message> = match self.active_tab {
TabId::Drawing => self.drawing_tab(),
TabId::Arrow => self.arrow_tab(),
TabId::History => self.history_tab(),
TabId::Performance => self.performance_tab(),
TabId::Ui => self.ui_tab(),
TabId::Board => self.board_tab(),
TabId::Capture => self.capture_tab(),
TabId::Session => self.session_tab(),
TabId::Keybindings => self.keybindings_tab(),
TabId::Tablet => self.tablet_tab(),
};

let legend = self.defaults_legend();
Expand Down Expand Up @@ -585,6 +592,12 @@ impl ConfiguratorApp {
]
.spacing(8);

let eraser_mode_pick = pick_list(
EraserModeOption::list(),
Some(self.draft.drawing_default_eraser_mode),
Message::EraserModeChanged,
);

let column = column![
text("Drawing Defaults").size(20),
color_block,
Expand All @@ -603,6 +616,55 @@ impl ConfiguratorApp {
)
]
.spacing(12),
row![
labeled_input(
"Eraser size (px)",
&self.draft.drawing_default_eraser_size,
&self.defaults.drawing_default_eraser_size,
TextField::DrawingEraserSize,
),
labeled_control(
"Eraser mode",
eraser_mode_pick.width(Length::Fill).into(),
self.defaults
.drawing_default_eraser_mode
.label()
.to_string(),
self.draft.drawing_default_eraser_mode
!= self.defaults.drawing_default_eraser_mode,
)
]
.spacing(12),
row![
labeled_input(
"Marker opacity (0.05-0.9)",
&self.draft.drawing_marker_opacity,
&self.defaults.drawing_marker_opacity,
TextField::DrawingMarkerOpacity,
),
labeled_input(
"Undo stack limit",
&self.draft.drawing_undo_stack_limit,
&self.defaults.drawing_undo_stack_limit,
TextField::DrawingUndoStackLimit,
)
]
.spacing(12),
row![
labeled_input(
"Hit-test tolerance (px)",
&self.draft.drawing_hit_test_tolerance,
&self.defaults.drawing_hit_test_tolerance,
TextField::DrawingHitTestTolerance,
),
labeled_input(
"Hit-test threshold",
&self.draft.drawing_hit_test_linear_threshold,
&self.defaults.drawing_hit_test_linear_threshold,
TextField::DrawingHitTestThreshold,
)
]
.spacing(12),
row![
labeled_input(
"Font family",
Expand Down Expand Up @@ -672,6 +734,12 @@ impl ConfiguratorApp {
self.draft.drawing_text_background_enabled,
self.defaults.drawing_text_background_enabled,
ToggleField::DrawingTextBackground,
),
toggle_row(
"Start shapes filled",
self.draft.drawing_default_fill_enabled,
self.defaults.drawing_default_fill_enabled,
ToggleField::DrawingFillEnabled,
)
]
.spacing(12)
Expand Down Expand Up @@ -711,6 +779,67 @@ impl ConfiguratorApp {
.into()
}

fn history_tab(&self) -> Element<'_, Message> {
scrollable(
column![
text("History").size(20),
row![
labeled_input(
"Undo all delay (ms)",
&self.draft.history_undo_all_delay_ms,
&self.defaults.history_undo_all_delay_ms,
TextField::HistoryUndoAllDelayMs,
),
labeled_input(
"Redo all delay (ms)",
&self.draft.history_redo_all_delay_ms,
&self.defaults.history_redo_all_delay_ms,
TextField::HistoryRedoAllDelayMs,
)
]
.spacing(12),
toggle_row(
"Enable custom undo/redo section",
self.draft.history_custom_section_enabled,
self.defaults.history_custom_section_enabled,
ToggleField::HistoryCustomSectionEnabled,
),
row![
labeled_input(
"Custom undo delay (ms)",
&self.draft.history_custom_undo_delay_ms,
&self.defaults.history_custom_undo_delay_ms,
TextField::HistoryCustomUndoDelayMs,
),
labeled_input(
"Custom redo delay (ms)",
&self.draft.history_custom_redo_delay_ms,
&self.defaults.history_custom_redo_delay_ms,
TextField::HistoryCustomRedoDelayMs,
)
]
.spacing(12),
row![
labeled_input(
"Custom undo steps",
&self.draft.history_custom_undo_steps,
&self.defaults.history_custom_undo_steps,
TextField::HistoryCustomUndoSteps,
),
labeled_input(
"Custom redo steps",
&self.draft.history_custom_redo_steps,
&self.defaults.history_custom_redo_steps,
TextField::HistoryCustomRedoSteps,
)
]
.spacing(12),
]
.spacing(12),
)
.into()
}

fn performance_tab(&self) -> Element<'_, Message> {
let buffer_pick = pick_list(
vec![2u32, 3, 4],
Expand Down Expand Up @@ -776,7 +905,30 @@ impl ConfiguratorApp {
UiTabId::ClickHighlight => self.ui_click_highlight_tab(),
};

column![text("UI Settings").size(20), tab_bar, content]
let general = column![
text("General UI").size(18),
labeled_input(
"Preferred output (xdg fallback)",
&self.draft.ui_preferred_output,
&self.defaults.ui_preferred_output,
TextField::UiPreferredOutput,
),
toggle_row(
"Use fullscreen xdg fallback",
self.draft.ui_xdg_fullscreen,
self.defaults.ui_xdg_fullscreen,
ToggleField::UiXdgFullscreen,
),
toggle_row(
"Enable context menu",
self.draft.ui_context_menu_enabled,
self.defaults.ui_context_menu_enabled,
ToggleField::UiContextMenuEnabled,
)
]
.spacing(12);

column![text("UI Settings").size(20), general, tab_bar, content]
.spacing(12)
.into()
}
Expand Down Expand Up @@ -805,6 +957,30 @@ impl ConfiguratorApp {
self.defaults.ui_toolbar_layout_mode.label().to_string(),
self.draft.ui_toolbar_layout_mode != self.defaults.ui_toolbar_layout_mode,
),
toggle_row(
"Pin top toolbar",
self.draft.ui_toolbar_top_pinned,
self.defaults.ui_toolbar_top_pinned,
ToggleField::UiToolbarTopPinned,
),
toggle_row(
"Pin side toolbar",
self.draft.ui_toolbar_side_pinned,
self.defaults.ui_toolbar_side_pinned,
ToggleField::UiToolbarSidePinned,
),
toggle_row(
"Use icon-only buttons",
self.draft.ui_toolbar_use_icons,
self.defaults.ui_toolbar_use_icons,
ToggleField::UiToolbarUseIcons,
),
toggle_row(
"Show extended colors",
self.draft.ui_toolbar_show_more_colors,
self.defaults.ui_toolbar_show_more_colors,
ToggleField::UiToolbarShowMoreColors,
),
toggle_row(
"Show presets",
self.draft.ui_toolbar_show_presets,
Expand Down Expand Up @@ -841,12 +1017,36 @@ impl ConfiguratorApp {
self.defaults.ui_toolbar_show_settings_section,
ToggleField::UiToolbarShowSettingsSection,
),
toggle_row(
"Show delay sliders",
self.draft.ui_toolbar_show_delay_sliders,
self.defaults.ui_toolbar_show_delay_sliders,
ToggleField::UiToolbarShowDelaySliders,
),
toggle_row(
"Show marker opacity controls",
self.draft.ui_toolbar_show_marker_opacity_section,
self.defaults.ui_toolbar_show_marker_opacity_section,
ToggleField::UiToolbarShowMarkerOpacitySection,
),
toggle_row(
"Show tool preview bubble",
self.draft.ui_toolbar_show_tool_preview,
self.defaults.ui_toolbar_show_tool_preview,
ToggleField::UiToolbarShowToolPreview,
),
toggle_row(
"Show preset action toasts",
self.draft.ui_toolbar_show_preset_toasts,
self.defaults.ui_toolbar_show_preset_toasts,
ToggleField::UiToolbarPresetToasts,
),
toggle_row(
"Force inline toolbars",
self.draft.ui_toolbar_force_inline,
self.defaults.ui_toolbar_force_inline,
ToggleField::UiToolbarForceInline,
),
text("Mode overrides").size(16),
row![text("Edit mode:"), override_mode_pick]
.spacing(12)
Expand All @@ -873,6 +1073,37 @@ impl ConfiguratorApp {
ToolbarOverrideField::ShowSettingsSection,
overrides.show_settings_section,
),
text("Placement offsets").size(16),
row![
labeled_input(
"Top offset X",
&self.draft.ui_toolbar_top_offset,
&self.defaults.ui_toolbar_top_offset,
TextField::ToolbarTopOffset,
),
labeled_input(
"Top offset Y",
&self.draft.ui_toolbar_top_offset_y,
&self.defaults.ui_toolbar_top_offset_y,
TextField::ToolbarTopOffsetY,
)
]
.spacing(12),
row![
labeled_input(
"Side offset Y",
&self.draft.ui_toolbar_side_offset,
&self.defaults.ui_toolbar_side_offset,
TextField::ToolbarSideOffset,
),
labeled_input(
"Side offset X",
&self.draft.ui_toolbar_side_offset_x,
&self.defaults.ui_toolbar_side_offset_x,
TextField::ToolbarSideOffsetX,
)
]
.spacing(12),
]
.spacing(12);

Expand Down Expand Up @@ -1189,6 +1420,12 @@ impl ConfiguratorApp {
self.defaults.session_persist_blackboard,
ToggleField::SessionPersistBlackboard,
),
toggle_row(
"Persist undo/redo history",
self.draft.session_persist_history,
self.defaults.session_persist_history,
ToggleField::SessionPersistHistory,
),
toggle_row(
"Restore tool state on startup",
self.draft.session_restore_tool_state,
Expand Down Expand Up @@ -1232,6 +1469,12 @@ impl ConfiguratorApp {
&self.defaults.session_max_shapes_per_frame,
TextField::SessionMaxShapesPerFrame,
))
.push(labeled_input(
"Max persisted undo depth (blank = runtime limit)",
&self.draft.session_max_persisted_undo_depth,
&self.defaults.session_max_persisted_undo_depth,
TextField::SessionMaxPersistedUndoDepth,
))
.push(labeled_input(
"Max file size (MB)",
&self.draft.session_max_file_size_mb,
Expand All @@ -1254,6 +1497,43 @@ impl ConfiguratorApp {
scrollable(column).into()
}

fn tablet_tab(&self) -> Element<'_, Message> {
scrollable(
column![
text("Tablet / Stylus").size(20),
toggle_row(
"Enable tablet input",
self.draft.tablet_enabled,
self.defaults.tablet_enabled,
ToggleField::TabletEnabled,
),
toggle_row(
"Enable pressure-to-thickness",
self.draft.tablet_pressure_enabled,
self.defaults.tablet_pressure_enabled,
ToggleField::TabletPressureEnabled,
),
row![
labeled_input(
"Min thickness",
&self.draft.tablet_min_thickness,
&self.defaults.tablet_min_thickness,
TextField::TabletMinThickness,
),
labeled_input(
"Max thickness",
&self.draft.tablet_max_thickness,
&self.defaults.tablet_max_thickness,
TextField::TabletMaxThickness,
)
]
.spacing(12),
]
.spacing(12),
)
.into()
}

fn keybindings_tab(&self) -> Element<'_, Message> {
let mut column = Column::new()
.spacing(8)
Expand Down
Loading