Skip to content

Paint window close buttons to avoid font reliance. #1510

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

Merged
rjwittams merged 1 commit into from
Jan 6, 2021
Merged

Paint window close buttons to avoid font reliance. #1510

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
4 changes: 2 additions & 2 deletions druid/src/widget/scope.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ impl<F: FnOnce(In) -> State, L: Lens<State, In>, In: Data, State: Data>
}
}

impl<F: Fn(Transfer::In) -> Transfer::State, Transfer: ScopeTransfer> ScopePolicy
impl<F: FnOnce(Transfer::In) -> Transfer::State, Transfer: ScopeTransfer> ScopePolicy
for DefaultScopePolicy<F, Transfer>
{
type In = Transfer::In;
Expand Down Expand Up @@ -248,7 +248,7 @@ impl<SP: ScopePolicy, W: Widget<SP::State>> Scope<SP, W> {
}

impl<
F: Fn(Transfer::In) -> Transfer::State,
F: FnOnce(Transfer::In) -> Transfer::State,
Transfer: ScopeTransfer,
W: Widget<Transfer::State>,
> Scope<DefaultScopePolicy<F, Transfer>, W>
Expand Down
42 changes: 39 additions & 3 deletions druid/src/widget/tabs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ use std::hash::Hash;
use std::marker::PhantomData;
use std::rc::Rc;

use crate::kurbo::Line;
use crate::kurbo::{Circle, Line};
use crate::widget::prelude::*;
use crate::widget::{Axis, Flex, Label, LabelText, LensScopeTransfer, Scope, ScopePolicy};
use crate::widget::{Axis, Flex, Label, LabelText, LensScopeTransfer, Painter, Scope, ScopePolicy};
use crate::{theme, Affine, Data, Insets, Lens, Point, SingleUse, WidgetExt, WidgetPod};

type TabsScope<TP> = Scope<TabsScopePolicy<TP>, Box<dyn Widget<TabsState<TP>>>>;
Expand Down Expand Up @@ -286,9 +286,45 @@ impl<TP: TabsPolicy> TabBar<TP> {
.padding(Insets::uniform_xy(9., 5.));

if can_close {
let close_button = Painter::new(|ctx, _, env| {
let circ_bounds = ctx.size().to_rect().inset(-2.);
let cross_bounds = circ_bounds.inset(-5.);
if ctx.is_hot() {
ctx.render_ctx.fill(
Circle::new(
circ_bounds.center(),
f64::min(circ_bounds.height(), circ_bounds.width()) / 2.,
),
&env.get(theme::BORDER_LIGHT),
);
}
let cross_color = &env.get(if ctx.is_hot() {
theme::BACKGROUND_DARK
} else {
theme::BORDER_LIGHT
});
ctx.render_ctx.stroke(
Line::new(
(cross_bounds.x0, cross_bounds.y0),
(cross_bounds.x1, cross_bounds.y1),
),
cross_color,
2.,
);
ctx.render_ctx.stroke(
Line::new(
(cross_bounds.x1, cross_bounds.y0),
(cross_bounds.x0, cross_bounds.y1),
),
cross_color,
2.,
);
})
.fix_size(20., 20.);

let row = Flex::row()
.with_child(label)
.with_child(Label::new("ⓧ").on_click(
.with_child(close_button.on_click(
move |_ctx, data: &mut TabsState<TP>, _env| {
data.policy.close_tab(key.clone(), &mut data.inner);
},
Expand Down