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

add config to change header height

This commit is contained in:
Dongdong Zhou 2022-05-22 21:58:42 +01:00
parent 6da96cbd7b
commit 7f01ad742f
6 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/settings.toml
View File

@ -6,6 +6,7 @@ icon-theme = ""
[ui]
font-family = ""
font-size = 13
header-height = 30
drop-shadow = true
[editor]

9
lapce-data/src/config.rs
View File

@ -160,6 +160,10 @@ pub struct UIConfig {
font_family: String,
#[field_names(desc = "Set the ui base font size")]
font_size: usize,
#[field_names(
desc = "Set the header height for panel header and editor tab header"
)]
header_height: usize,
#[field_names(desc = "Controls if the UI uses drop shadow")]
drop_shadow: bool,
}
@ -177,6 +181,11 @@ pub fn font_size(&self) -> usize {
self.font_size.max(6).min(32)
}
pub fn header_height(&self) -> usize {
let font_size = self.font_size();
self.header_height.max(font_size)
}
pub fn drop_shadow(&self) -> bool {
self.drop_shadow
}

87
lapce-ui/src/editor/header.rs
View File

@ -1,7 +1,7 @@
use std::{iter::Iterator, path::PathBuf};
use druid::{
piet::{Text, TextLayout as TextLayoutTrait, TextLayoutBuilder},
piet::{Text, TextAttribute, TextLayout as TextLayoutTrait, TextLayoutBuilder},
BoxConstraints, Command, Env, Event, EventCtx, LayoutCtx, LifeCycle,
LifeCycleCtx, MouseEvent, PaintCtx, Point, Rect, RenderContext, Size, Target,
UpdateCtx, Widget, WidgetId,
@ -26,7 +26,6 @@ pub struct LapceEditorHeader {
cross_rect: Rect,
mouse_pos: Point,
pub view_is_hot: bool,
height: f64,
icon_size: f64,
icons: Vec<LapceIcon>,
svg_padding: f64,
@ -40,7 +39,6 @@ pub fn new(view_id: WidgetId) -> Self {
cross_rect: Rect::ZERO,
mouse_pos: Point::ZERO,
view_is_hot: false,
height: 30.0,
icon_size: 24.0,
svg_padding: 4.0,
icons: Vec::new(),
@ -49,7 +47,7 @@ pub fn new(view_id: WidgetId) -> Self {
pub fn get_icons(&self, self_size: Size, data: &LapceTabData) -> Vec<LapceIcon> {
let _data = data.editor_view_content(self.view_id);
let gap = (self.height - self.icon_size) / 2.0;
let gap = (data.config.ui.header_height() as f64 - self.icon_size) / 2.0;
let mut icons = Vec::new();
let x =
@ -152,11 +150,15 @@ pub fn paint_buffer(
ctx.clip(clip_rect);
let svg = file_svg_new(&path);
let width = 13.0;
let height = 13.0;
let rect = Size::new(width, height).to_rect().with_origin(
Point::new((30.0 - width) / 2.0, (30.0 - height) / 2.0),
);
let font_size = data.config.ui.font_size() as f64;
let width = font_size;
let height = font_size;
let rect =
Size::new(width, height).to_rect().with_origin(Point::new(
(size.height - width) / 2.0,
(size.height - height) / 2.0,
));
ctx.draw_svg(&svg, rect, None);
let mut file_name = path
@ -170,28 +172,6 @@ pub fn paint_buffer(
if let Some(_compare) = data.editor.compare.as_ref() {
file_name += " (Working tree)";
}
let text_layout = ctx
.text()
.new_text_layout(file_name)
.font(
data.config.ui.font_family(),
data.config.ui.font_size() as f64,
)
.text_color(
data.config
.get_color_unchecked(LapceTheme::EDITOR_FOREGROUND)
.clone(),
)
.build()
.unwrap();
ctx.draw_text(
&text_layout,
Point::new(
30.0,
(size.height - text_layout.size().height) / 2.0,
),
);
if let Some(workspace_path) = workspace.path.as_ref() {
path = path
.strip_prefix(workspace_path)
@ -204,30 +184,36 @@ pub fn paint_buffer(
.unwrap_or("")
.to_string();
if !folder.is_empty() {
let x = text_layout.size().width;
let text_layout = ctx
.text()
.new_text_layout(folder)
.font(
data.config.ui.font_family(),
data.config.ui.font_size() as f64,
)
.text_color(
file_name = format!("{} {}", file_name, folder);
}
let total_len = file_name.len();
let mut text_layout = ctx
.text()
.new_text_layout(file_name)
.font(data.config.ui.font_family(), font_size)
.text_color(
data.config
.get_color_unchecked(LapceTheme::EDITOR_FOREGROUND)
.clone(),
);
if !folder.is_empty() {
text_layout = text_layout.range_attribute(
total_len - folder.len()..total_len,
TextAttribute::TextColor(
data.config
.get_color_unchecked(LapceTheme::EDITOR_DIM)
.clone(),
)
.build()
.unwrap();
ctx.draw_text(
&text_layout,
Point::new(
30.0 + x + 5.0,
(size.height - text_layout.size().height) / 2.0,
),
);
}
let text_layout = text_layout.build().unwrap();
ctx.draw_text(
&text_layout,
Point::new(
size.height,
(size.height - text_layout.size().height) / 2.0,
),
);
});
}
@ -311,7 +297,8 @@ fn layout(
&& (!data.config.editor.show_tab
|| self.view_id == data.palette.preview_editor)
{
let size = Size::new(bc.max().width, self.height);
let size =
Size::new(bc.max().width, data.config.ui.header_height() as f64);
self.icons = self.get_icons(size, data);
let cross_size = 20.0;
let padding = (size.height - cross_size) / 2.0;

5
lapce-ui/src/editor/tab.rs
View File

@ -539,8 +539,9 @@ fn paint(
size: Size,
mouse_pos: Point,
) {
let width = 13.0;
let height = 13.0;
let font_size = data.config.ui.font_size() as f64;
let width = font_size;
let height = font_size;
let padding = 4.0;
let editor_tab = data.main_split.editor_tabs.get(&widget_id).unwrap();

7
lapce-ui/src/editor/tab_header.rs
View File

@ -140,14 +140,15 @@ fn layout(
self.icons.clear();
let size = if data.config.editor.show_tab {
let height = 30.0;
let size = Size::new(bc.max().width, height);
let header_height = data.config.ui.header_height() as f64;
let size =
Size::new(bc.max().width, data.config.ui.header_height() as f64);
let editor_tab =
data.main_split.editor_tabs.get(&self.widget_id).unwrap();
if self.is_hot || *editor_tab.content_is_hot.borrow() {
let icon_size = 24.0;
let gap = (height - icon_size) / 2.0;
let gap = (header_height - icon_size) / 2.0;
let x =
size.width - ((self.icons.len() + 1) as f64) * (gap + icon_size);
let icon = LapceIcon {

4
lapce-ui/src/panel.rs
View File

@ -539,8 +539,8 @@ fn layout(
data: &LapceTabData,
_env: &Env,
) -> Size {
let height = 30.0;
let self_size = Size::new(bc.max().width, height);
let self_size =
Size::new(bc.max().width, data.config.ui.header_height() as f64);
self.update_icons(self_size, data);
self_size
}