From f3c2caecb05345cea9acfb9fe8c3cf3cc1fa44d8 Mon Sep 17 00:00:00 2001 From: Dongdong Zhou Date: Wed, 29 Jun 2022 21:22:15 +0100 Subject: [PATCH] remove activity bar --- lapce-ui/src/activity.rs | 126 --------------------------------------- lapce-ui/src/lib.rs | 1 - lapce-ui/src/tab.rs | 27 +++------ 3 files changed, 7 insertions(+), 147 deletions(-) delete mode 100644 lapce-ui/src/activity.rs diff --git a/lapce-ui/src/activity.rs b/lapce-ui/src/activity.rs deleted file mode 100644 index d8af1acb..00000000 --- a/lapce-ui/src/activity.rs +++ /dev/null @@ -1,126 +0,0 @@ -use crate::svg::get_svg; -use druid::{ - kurbo::Line, BoxConstraints, Command, Cursor, Env, Event, EventCtx, LayoutCtx, - LifeCycle, LifeCycleCtx, PaintCtx, Point, RenderContext, Size, Target, - UpdateCtx, Widget, -}; -use lapce_data::{ - command::{CommandKind, LapceCommand, LapceWorkbenchCommand, LAPCE_COMMAND}, - config::LapceTheme, - data::LapceTabData, - panel::PanelPosition, -}; -use serde_json::json; - -pub struct ActivityBar {} - -impl ActivityBar { - pub fn new() -> Self { - Self {} - } -} - -impl Default for ActivityBar { - fn default() -> Self { - Self::new() - } -} - -impl Widget for ActivityBar { - fn event( - &mut self, - _ctx: &mut EventCtx, - _event: &Event, - _data: &mut LapceTabData, - _env: &Env, - ) { - } - - fn lifecycle( - &mut self, - _ctx: &mut LifeCycleCtx, - _event: &LifeCycle, - _data: &LapceTabData, - _env: &Env, - ) { - } - - fn update( - &mut self, - _ctx: &mut UpdateCtx, - _old_data: &LapceTabData, - _data: &LapceTabData, - _env: &Env, - ) { - } - - fn layout( - &mut self, - _ctx: &mut LayoutCtx, - bc: &BoxConstraints, - _data: &LapceTabData, - _env: &Env, - ) -> Size { - bc.max() - } - - fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, _env: &Env) { - let size = ctx.size(); - let rect = size.to_rect(); - - let shadow_width = data.config.ui.drop_shadow_width() as f64; - if shadow_width > 0.0 { - ctx.blurred_rect( - rect, - shadow_width, - data.config - .get_color_unchecked(LapceTheme::LAPCE_DROPDOWN_SHADOW), - ); - } else { - ctx.stroke( - Line::new( - Point::new(rect.x1 + 0.5, rect.y0), - Point::new(rect.x1 + 0.5, rect.y1), - ), - data.config.get_color_unchecked(LapceTheme::LAPCE_BORDER), - 1.0, - ); - } - - ctx.fill( - rect, - data.config - .get_color_unchecked(LapceTheme::ACTIVITY_BACKGROUND), - ); - - let mut offset = 0.0; - let svg_color = data - .config - .get_color_unchecked(LapceTheme::EDITOR_FOREGROUND) - .clone(); - if let Some(panel) = data.panels.get(&PanelPosition::LeftTop) { - for kind in panel.widgets.iter() { - let svg = get_svg(kind.svg_name()).unwrap(); - if &panel.active == kind && panel.shown { - ctx.fill( - Size::new(size.width, size.width) - .to_rect() - .with_origin(Point::new(0.0, offset)), - data.config - .get_color_unchecked(LapceTheme::ACTIVITY_CURRENT), - ); - } - let svg_size = 25.0; - let rect = - Size::new(svg_size, svg_size) - .to_rect() - .with_origin(Point::new( - (size.width - svg_size) / 2.0, - (size.width - svg_size) / 2.0 + offset, - )); - ctx.draw_svg(&svg, rect, Some(&svg_color)); - offset += size.width; - } - } - } -} diff --git a/lapce-ui/src/lib.rs b/lapce-ui/src/lib.rs index 42e49c95..e03e6e49 100644 --- a/lapce-ui/src/lib.rs +++ b/lapce-ui/src/lib.rs @@ -1,4 +1,3 @@ -pub mod activity; pub mod alert; pub mod app; pub mod button; diff --git a/lapce-ui/src/tab.rs b/lapce-ui/src/tab.rs index 1fbfe26d..b98db23d 100644 --- a/lapce-ui/src/tab.rs +++ b/lapce-ui/src/tab.rs @@ -1,7 +1,6 @@ use std::{collections::HashMap, path::PathBuf, sync::Arc}; use druid::{ - kurbo::Line, piet::{PietTextLayout, Text, TextLayout, TextLayoutBuilder}, BoxConstraints, Command, Data, Env, Event, EventCtx, InternalLifeCycle, LayoutCtx, LifeCycle, LifeCycleCtx, PaintCtx, Point, Rect, RenderContext, Size, @@ -30,7 +29,7 @@ keypress::{DefaultKeyPressHandler, KeyPressData}, menu::MenuKind, palette::PaletteStatus, - panel::{PanelContainerPosition, PanelPosition, PanelResizePosition}, + panel::{PanelContainerPosition, PanelResizePosition}, proxy::path_from_url, }; use lsp_types::DiagnosticSeverity; @@ -38,23 +37,12 @@ use xi_rope::Rope; use crate::{ - activity::ActivityBar, - alert::AlertBox, - completion::CompletionContainer, - explorer::FileExplorer, - hover::HoverContainer, - palette::Palette, - panel::{PanelContainer, PanelSwitcher}, - picker::FilePicker, - plugin::Plugin, - problem::new_problem_panel, - search::new_search_panel, - settings::LapceSettingsPanel, - source_control::new_source_control_panel, - split::split_data_widget, - status::LapceStatus, - svg::get_svg, - terminal::TerminalPanel, + alert::AlertBox, completion::CompletionContainer, explorer::FileExplorer, + hover::HoverContainer, palette::Palette, panel::PanelContainer, + picker::FilePicker, plugin::Plugin, problem::new_problem_panel, + search::new_search_panel, settings::LapceSettingsPanel, + source_control::new_source_control_panel, split::split_data_widget, + status::LapceStatus, svg::get_svg, terminal::TerminalPanel, }; pub struct LapceIcon { @@ -98,7 +86,6 @@ pub fn new(data: &mut LapceTabData) -> Self { .unwrap(); let main_split = split_data_widget(split_data, data); - let activity = ActivityBar::new(); let completion = CompletionContainer::new(&data.completion); let hover = HoverContainer::new(&data.hover); let palette = Palette::new(data);