Skip to content

S,M,L connected to SpinButton #178

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

Draft
fabienjuif wants to merge 1 commit into
base: main
Choose a base branch
from
+133 −345
Draft

S,M,L connected to SpinButton #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ impl Default for Configuration {
corner_roundness: 12.0,
initial_tool: Tools::Pointer,
copy_command: None,
annotation_size_factor: 1.0,
annotation_size_factor: 100.0, /* 100% ~ medium | 33% ~ small | 300% ~ large */
action_on_enter: Action::SaveToClipboard,
action_on_escape: Action::Exit,
save_after_copy: false,
Expand Down
6 changes: 0 additions & 6 deletions src/sketch_board.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,12 +430,6 @@ impl SketchBoard {
.borrow_mut()
.handle_event(ToolEvent::StyleChanged(self.style))
}
ToolbarEvent::AnnotationSizeChanged(value) => {
self.style.annotation_size_factor = value;
self.active_tool
.borrow_mut()
.handle_event(ToolEvent::StyleChanged(self.style))
}
}
}
}
Expand Down
90 changes: 20 additions & 70 deletions src/style.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ pub struct Style {
pub color: Color,
pub size: Size,
pub fill: bool,
pub annotation_size_factor: f32,
}

#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
Expand All @@ -27,21 +26,19 @@ pub struct Color {
pub a: u8,
}

#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
pub enum Size {
Small = 0,
#[default]
Medium = 1,
Large = 2,
#[derive(Debug, PartialEq, PartialOrd, Clone, Copy)]
pub struct Size {
pub value: f32,
}

impl Default for Style {
fn default() -> Self {
Self {
color: Color::default(),
size: Size::default(),
fill: bool::default(),
annotation_size_factor: APP_CONFIG.read().annotation_size_factor(),
size: Size {
value: APP_CONFIG.read().annotation_size_factor(),
},
}
}
}
Expand Down Expand Up @@ -165,81 +162,34 @@ impl From<Style> for Paint {
fn from(value: Style) -> Self {
Paint::default()
.with_anti_alias(true)
.with_font_size(value.size.to_text_size(value.annotation_size_factor) as f32)
.with_font_size(value.size.to_text_size())
.with_color(value.color.into())
.with_line_width(value.size.to_line_width(value.annotation_size_factor))
}
}

impl StaticVariantType for Size {
fn static_variant_type() -> Cow<'static, VariantTy> {
Cow::Borrowed(VariantTy::UINT32)
}
}

impl ToVariant for Size {
fn to_variant(&self) -> Variant {
Variant::from(*self as u32)
}
}

impl FromVariant for Size {
fn from_variant(variant: &Variant) -> Option<Self> {
variant.get::<u32>().and_then(|v| match v {
0 => Some(Size::Small),
1 => Some(Size::Medium),
2 => Some(Size::Large),
_ => None,
})
.with_line_width(value.size.to_line_width())
}
}

impl Size {
pub fn to_text_size(self, size_factor: f32) -> i32 {
match self {
Size::Small => (36.0 * size_factor) as i32,
Size::Medium => (54.0 * size_factor) as i32,
Size::Large => (96.0 * size_factor) as i32,
}
pub fn to_text_size(self) -> f32 {
Copy link
Collaborator Author

@fabienjuif fabienjuif May 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At one point it should be resolved to each tools maybe

self.value
}

pub fn to_line_width(self, size_factor: f32) -> f32 {
match self {
Size::Small => 3.0 * size_factor,
Size::Medium => 5.0 * size_factor,
Size::Large => 7.0 * size_factor,
}
pub fn to_line_width(self) -> f32 {
0.1 * self.value
}

pub fn to_arrow_tail_width(self, size_factor: f32) -> f32 {
match self {
Size::Small => 3.0 * size_factor,
Size::Medium => 10.0 * size_factor,
Size::Large => 25.0 * size_factor,
}
pub fn to_arrow_tail_width(self) -> f32 {
0.2 * self.value
}

pub fn to_arrow_head_length(self, size_factor: f32) -> f32 {
match self {
Size::Small => 15.0 * size_factor,
Size::Medium => 30.0 * size_factor,
Size::Large => 60.0 * size_factor,
}
pub fn to_arrow_head_length(self) -> f32 {
0.6 * self.value
}

pub fn to_blur_factor(self, size_factor: f32) -> f32 {
match self {
Size::Small => 10.0 * size_factor,
Size::Medium => 20.0 * size_factor,
Size::Large => 30.0 * size_factor,
}
pub fn to_blur_factor(self) -> f32 {
0.4 * self.value
}

pub fn to_highlight_width(self, size_factor: f32) -> f32 {
match self {
Size::Small => 15.0 * size_factor,
Size::Medium => 30.0 * size_factor,
Size::Large => 45.0 * size_factor,
}
pub fn to_highlight_width(self) -> f32 {
0.6 * self.value
}
}
10 changes: 2 additions & 8 deletions src/tools/arrow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,9 @@ impl Drawable for Arrow {
canvas.rotate(arrow_direction.angle().radians);

// The width of the tail (double distance from start to head side)
let tail_width = self
.style
.size
.to_arrow_tail_width(self.style.annotation_size_factor);
let tail_width = self.style.size.to_arrow_tail_width();
// The length of the (sloped) side of the arrow head (distance from end to head side).
let head_side_length = self
.style
.size
.to_arrow_head_length(self.style.annotation_size_factor);
let head_side_length = self.style.size.to_arrow_head_length();
// The offset of the midpoint is the distance the midpoint moves toward the end of the arrow.
// A offset of 0 will place the midpoint right below the head side.
// A negative value will result in a diamond head.
Expand Down
4 changes: 1 addition & 3 deletions src/tools/blur.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,7 @@ impl Drawable for Blur {
canvas,
pos,
size,
self.style
.size
.to_blur_factor(self.style.annotation_size_factor),
self.style.size.to_blur_factor(),
)?);
}

Expand Down
6 changes: 1 addition & 5 deletions src/tools/highlight.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,7 @@ impl Highlight for Highlighter<FreehandHighlight> {
self.style.color.b,
(255.0 * HIGHLIGHT_OPACITY) as u8,
));
paint.set_line_width(
self.style
.size
.to_highlight_width(self.style.annotation_size_factor),
);
paint.set_line_width(self.style.size.to_highlight_width());
paint.set_line_join(femtovg::LineJoin::Round);
paint.set_line_cap(femtovg::LineCap::Square);

Expand Down
15 changes: 3 additions & 12 deletions src/tools/marker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,7 @@ impl Drawable for Marker {

let mut paint = Paint::color(Color::white());
paint.set_font(&[font]);
paint.set_font_size(
(self
.style
.size
.to_text_size(self.style.annotation_size_factor)) as f32,
);
paint.set_font_size(self.style.size.to_text_size());
paint.set_text_align(femtovg::Align::Center);
paint.set_text_baseline(femtovg::Baseline::Middle);

Expand Down Expand Up @@ -69,12 +64,8 @@ impl Drawable for Marker {
femtovg::Solidity::Solid,
);

let circle_paint = Paint::color(self.style.color.into()).with_line_width(
self.style
.size
.to_line_width(self.style.annotation_size_factor)
* 2.0,
);
let circle_paint = Paint::color(self.style.color.into())
.with_line_width(self.style.size.to_line_width() * 2.0);

canvas.save();
canvas.fill_path(&inner_circle_path, &circle_paint);
Expand Down
Loading