Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/gtk/draw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2127,6 +2127,7 @@ pub(super) fn draw_dialog_popup(
button_width: btn_max_w as f32,
button_gap: button_gap as f32,
padding: padding as f32,
table_height: 0.0,
};
let viewport = quadraui::Rect::new(0.0, 0.0, editor_width as f32, editor_height as f32);
let dialog_layout = dialog.layout(viewport, measure, |_| {
Expand Down
43 changes: 43 additions & 0 deletions src/gtk/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10035,6 +10035,49 @@ impl App {
}
}

// ── Dormant ShellApp impl (#448-B) ──────────────────────────────────────────
// This impl compiles alongside the Relm4 path but is NOT wired up.
// It will replace the Relm4 update loop in #448-C when the ShellApp runner
// is activated.
impl quadraui::ShellApp for App {
fn render_content(
&self,
_backend: &mut dyn quadraui::Backend,
_layout: &quadraui::AppShellLayout,
) {
// Will delegate to the Cairo draw pipeline once wired in #448-C.
todo!()
}

fn handle(
&mut self,
event: quadraui::UiEvent,
_backend: &mut dyn quadraui::Backend,
_ctx: &quadraui::ShellContext<'_>,
) -> quadraui::Reaction {
// Routes UiEvent variants to the same handlers as the Relm4 update path.
// handle_key_press and dispatch_engine_action both require a
// ComponentSender; the sender integration is deferred to #448-C.
match event {
quadraui::UiEvent::KeyPressed { .. } | quadraui::UiEvent::CharTyped(_) => {
// Delegate to self.handle_key_press(key_name, unicode, ctrl, alt, sender)
// once the ComponentSender is available via the ShellApp runner.
todo!()
}
quadraui::UiEvent::MouseDown { .. }
| quadraui::UiEvent::MouseUp { .. }
| quadraui::UiEvent::MouseMoved { .. }
| quadraui::UiEvent::DoubleClick { .. }
| quadraui::UiEvent::Scroll { .. } => {
// Route through self.dispatch_engine_action(action, sender, false)
// once the ComponentSender is available via the ShellApp runner.
todo!()
}
_ => quadraui::Reaction::Continue,
}
}
}

// view_row_to_buf_line and view_row_to_buf_pos_wrap are now shared functions
// in render.rs — use render::view_row_to_buf_line / render::view_row_to_buf_pos_wrap.

Expand Down
4 changes: 4 additions & 0 deletions src/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2019,6 +2019,7 @@ pub fn debug_toolbar(engine: &Engine) -> quadraui::Toolbar {
session && stopped,
),
],
focused_index: None,
}
}

Expand Down Expand Up @@ -3723,6 +3724,7 @@ pub fn dialog_panel_to_quadraui_dialog(panel: &DialogPanel) -> quadraui::Dialog
cursor: None,
})
}),
table: None,
}
}

Expand Down Expand Up @@ -6496,6 +6498,7 @@ pub fn sc_button_toolbar(sc: &SourceControlData) -> quadraui::Toolbar {
action(2, "", icons::GIT_PULL.s(), None, true),
action(3, "", icons::GIT_SYNC.s(), None, true),
],
focused_index: None,
}
}

Expand Down Expand Up @@ -8147,6 +8150,7 @@ pub fn picker_panel_to_palette(picker: &PickerPanel) -> quadraui::Palette {
show_query: true,
create_label: None,
preview,
mode: quadraui::PaletteMode::List,
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/tui_main/render_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,7 @@ pub(super) fn draw_frame(
button_width: capped_btn_w,
button_gap: 0.0,
padding: 1.0,
table_height: 0.0,
};
let layout = q_dialog.layout(viewport, measure, |_| {
quadraui::ToolbarItemMeasure::new(0.0)
Expand Down Expand Up @@ -1148,6 +1149,7 @@ fn folder_picker_to_palette(picker: &FolderPickerState, popup_width: usize) -> q
show_query: true,
create_label: None,
preview: None,
mode: quadraui::PaletteMode::List,
}
}

Expand Down