Rooba
/
lapce
mirror of https://github.com/lapce/lapce.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #220 from bugadani/toggle 

Fix click-to-toggle panels
This commit is contained in:
Dongdong Zhou 2022-03-23 21:35:22 +00:00 committed by GitHub
parent b495637c0e 446577c725
commit aaa761a361
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 151 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lapce-data/src/command.rs
View File

@ -192,26 +192,51 @@ pub enum LapceWorkbenchCommand {
#[strum(serialize = "show_panel")]
ShowPanel,
#[strum(serialize = "toggle_panel")]
TogglePanel,
/// Toggles the panel passed in parameter.
#[strum(serialize = "toggle_panel_focus")]
TogglePanelFocus,
#[strum(serialize = "toggle_terminal")]
ToggleTerminal,
/// Toggles the panel passed in parameter.
#[strum(serialize = "toggle_panel_visual")]
TogglePanelVisual,
#[strum(serialize = "toggle_source_control")]
ToggleSourceControl,
// Focus toggle commands
#[strum(serialize = "toggle_terminal_focus")]
ToggleTerminalFocus,
#[strum(serialize = "toggle_plugin")]
TogglePlugin,
#[strum(serialize = "toggle_source_control_focus")]
ToggleSourceControlFocus,
#[strum(serialize = "toggle_file_explorer")]
ToggleFileExplorer,
#[strum(serialize = "toggle_plugin_focus")]
TogglePluginFocus,
#[strum(serialize = "toggle_problem")]
ToggleProblem,
#[strum(serialize = "toggle_file_explorer_focus")]
ToggleFileExplorerFocus,
#[strum(serialize = "toggle_search")]
ToggleSearch,
#[strum(serialize = "toggle_problem_focus")]
ToggleProblemFocus,
#[strum(serialize = "toggle_search_focus")]
ToggleSearchFocus,
// Visual toggle commands
#[strum(serialize = "toggle_terminal_visual")]
ToggleTerminalVisual,
#[strum(serialize = "toggle_source_control_visual")]
ToggleSourceControlVisual,
#[strum(serialize = "toggle_plugin_visual")]
TogglePluginVisual,
#[strum(serialize = "toggle_file_explorer_visual")]
ToggleFileExplorerVisual,
#[strum(serialize = "toggle_problem_visual")]
ToggleProblemVisual,
#[strum(serialize = "toggle_search_visual")]
ToggleSearchVisual,
#[strum(serialize = "focus_editor")]
FocusEditor,

138
lapce-data/src/data.rs
View File

@ -300,7 +300,7 @@ pub struct EditorDiagnostic {
pub diagnositc: Diagnostic,
}
#[derive(Clone, Copy, PartialEq, Data, Serialize, Deserialize, Hash, Eq)]
#[derive(Clone, Copy, PartialEq, Data, Serialize, Deserialize, Hash, Eq, Debug)]
pub enum PanelKind {
FileExplorer,
SourceControl,
@ -1196,9 +1196,6 @@ pub fn run_workbench_command(
Target::Auto,
));
}
LapceWorkbenchCommand::ToggleTerminal => {
self.toggle_panel(ctx, PanelKind::Terminal);
}
LapceWorkbenchCommand::ToggleMaximizedPanel => {
if let Some(data) = data {
if let Ok(kind) = serde_json::from_value::<PanelKind>(data) {
@ -1234,28 +1231,59 @@ pub fn run_workbench_command(
Target::Widget(self.terminal.active),
));
}
LapceWorkbenchCommand::ToggleSourceControl => {
self.toggle_panel(ctx, PanelKind::SourceControl);
LapceWorkbenchCommand::ToggleSourceControlVisual => {
self.toggle_panel_visual(ctx, PanelKind::SourceControl);
}
LapceWorkbenchCommand::TogglePlugin => {
self.toggle_panel(ctx, PanelKind::Plugin);
LapceWorkbenchCommand::TogglePluginVisual => {
self.toggle_panel_visual(ctx, PanelKind::Plugin);
}
LapceWorkbenchCommand::ToggleFileExplorer => {
self.toggle_panel(ctx, PanelKind::FileExplorer);
LapceWorkbenchCommand::ToggleFileExplorerVisual => {
self.toggle_panel_visual(ctx, PanelKind::FileExplorer);
}
LapceWorkbenchCommand::ToggleSearch => {
self.toggle_panel(ctx, PanelKind::Search);
LapceWorkbenchCommand::ToggleSearchVisual => {
self.toggle_panel_visual(ctx, PanelKind::Search);
}
LapceWorkbenchCommand::ToggleProblem => {
self.toggle_panel(ctx, PanelKind::Problem);
LapceWorkbenchCommand::ToggleProblemVisual => {
self.toggle_panel_visual(ctx, PanelKind::Problem);
}
LapceWorkbenchCommand::TogglePanel => {
LapceWorkbenchCommand::ToggleTerminalVisual => {
self.toggle_panel_visual(ctx, PanelKind::Terminal);
}
LapceWorkbenchCommand::TogglePanelVisual => {
if let Some(data) = data {
if let Ok(kind) = serde_json::from_value::<PanelKind>(data) {
self.toggle_panel(ctx, kind);
self.toggle_panel_visual(ctx, kind);
}
}
}
LapceWorkbenchCommand::ToggleSourceControlFocus => {
self.toggle_panel_focus(ctx, PanelKind::SourceControl);
}
LapceWorkbenchCommand::TogglePluginFocus => {
self.toggle_panel_focus(ctx, PanelKind::Plugin);
}
LapceWorkbenchCommand::ToggleFileExplorerFocus => {
self.toggle_panel_focus(ctx, PanelKind::FileExplorer);
}
LapceWorkbenchCommand::ToggleSearchFocus => {
self.toggle_panel_focus(ctx, PanelKind::Search);
}
LapceWorkbenchCommand::ToggleProblemFocus => {
self.toggle_panel_focus(ctx, PanelKind::Problem);
}
LapceWorkbenchCommand::ToggleTerminalFocus => {
self.toggle_panel_focus(ctx, PanelKind::Terminal);
}
LapceWorkbenchCommand::TogglePanelFocus => {
if let Some(data) = data {
if let Ok(kind) = serde_json::from_value::<PanelKind>(data) {
self.toggle_panel_focus(ctx, kind);
}
}
}
LapceWorkbenchCommand::ShowPanel => {
if let Some(data) = data {
if let Ok(kind) = serde_json::from_value::<PanelKind>(data) {
@ -1406,9 +1434,25 @@ pub fn terminal_update_process(
}
}
fn is_panel_visible(&mut self, kind: PanelKind) -> bool {
for (_, panel) in self.panels.iter() {
if panel.widgets.contains(&kind) {
return panel.active == kind && panel.shown;
}
}
return false;
}
fn is_panel_focused(&mut self, kind: PanelKind) -> bool {
// Moving between e.g. Search and Problems doesn't affect focus, so we need to also check
// visibility.
self.focus_area == FocusArea::Panel(kind) && self.is_panel_visible(kind)
}
fn hide_panel(&mut self, ctx: &mut EventCtx, kind: PanelKind) {
for (_, panel) in self.panels.iter_mut() {
if panel.widgets.contains(&kind) {
if panel.active == kind {
let panel = Arc::make_mut(panel);
panel.shown = false;
break;
@ -1425,32 +1469,48 @@ fn hide_panel(&mut self, ctx: &mut EventCtx, kind: PanelKind) {
fn show_panel(&mut self, ctx: &mut EventCtx, kind: PanelKind) {
for (_, panel) in self.panels.iter_mut() {
for k in panel.widgets.clone() {
if k == kind {
let panel = Arc::make_mut(panel);
panel.shown = true;
panel.active = k;
let focus_id = match kind {
PanelKind::FileExplorer => self.file_explorer.widget_id,
PanelKind::SourceControl => self.source_control.active,
PanelKind::Plugin => self.plugin.widget_id,
PanelKind::Terminal => self.terminal.widget_id,
PanelKind::Search => self.search.active,
PanelKind::Problem => self.problem.widget_id,
};
ctx.submit_command(Command::new(
LAPCE_UI_COMMAND,
LapceUICommand::Focus,
Target::Widget(focus_id),
));
break;
}
if panel.widgets.contains(&kind) {
let panel = Arc::make_mut(panel);
panel.shown = true;
panel.active = kind;
let focus_id = match kind {
PanelKind::FileExplorer => self.file_explorer.widget_id,
PanelKind::SourceControl => self.source_control.active,
PanelKind::Plugin => self.plugin.widget_id,
PanelKind::Terminal => self.terminal.widget_id,
PanelKind::Search => self.search.active,
PanelKind::Problem => self.problem.widget_id,
};
ctx.submit_command(Command::new(
LAPCE_UI_COMMAND,
LapceUICommand::Focus,
Target::Widget(focus_id),
));
break;
}
}
}
fn toggle_panel(&mut self, ctx: &mut EventCtx, kind: PanelKind) {
if self.focus_area == FocusArea::Panel(kind) {
fn toggle_panel_visual(&mut self, ctx: &mut EventCtx, kind: PanelKind) {
if self.is_panel_visible(kind) {
self.hide_panel(ctx, kind);
} else {
self.show_panel(ctx, kind);
}
}
fn toggle_panel_focus(&mut self, ctx: &mut EventCtx, kind: PanelKind) {
let should_hide = match kind {
PanelKind::FileExplorer | PanelKind::Plugin | PanelKind::Problem => {
// Some panels don't accept focus (yet). Fall back to visibility check
// in those cases.
self.is_panel_visible(kind)
}
PanelKind::Terminal | PanelKind::SourceControl | PanelKind::Search => {
self.is_panel_focused(kind)
}
};
if should_hide {
self.hide_panel(ctx, kind);
} else {
self.show_panel(ctx, kind);

3
lapce-ui/src/activity.rs
View File

@ -1,4 +1,3 @@
use druid::{
BoxConstraints, Command, Cursor, Env, Event, EventCtx, LayoutCtx, LifeCycle,
LifeCycleCtx, PaintCtx, Point, RenderContext, Size, Target, UpdateCtx, Widget,
@ -46,7 +45,7 @@ fn event(
ctx.submit_command(Command::new(
LAPCE_NEW_COMMAND,
LapceCommandNew {
cmd: LapceWorkbenchCommand::TogglePanel
cmd: LapceWorkbenchCommand::TogglePanelFocus
.to_string(),
data: Some(json!(kind)),
palette_desc: None,

19
lapce-ui/src/status.rs
View File

@ -54,15 +54,20 @@ fn panel_icons(&self, self_size: Size, data: &LapceTabData) -> Vec<LapceIcon> {
.enumerate()
.map(|(i, p)| {
let cmd = match p {
PanelKind::FileExplorer => LapceWorkbenchCommand::ToggleTerminal,
PanelKind::SourceControl => {
LapceWorkbenchCommand::ToggleSourceControl
PanelKind::FileExplorer => {
LapceWorkbenchCommand::ToggleFileExplorerFocus
}
PanelKind::Plugin => LapceWorkbenchCommand::TogglePlugin,
PanelKind::Terminal => LapceWorkbenchCommand::ToggleTerminal,
PanelKind::Search => LapceWorkbenchCommand::ToggleSearch,
PanelKind::Problem => LapceWorkbenchCommand::ToggleProblem,
PanelKind::SourceControl => {
LapceWorkbenchCommand::ToggleSourceControlFocus
}
PanelKind::Plugin => LapceWorkbenchCommand::TogglePluginFocus,
PanelKind::Terminal => {
LapceWorkbenchCommand::ToggleTerminalFocus
}
PanelKind::Search => LapceWorkbenchCommand::ToggleSearchFocus,
PanelKind::Problem => LapceWorkbenchCommand::ToggleProblemFocus,
};
LapceIcon {
icon: p.svg_name(),
rect: Size::new(self_size.height, self_size.height)