change default text align and fix scroll drawing
This commit is contained in:
@@ -121,9 +121,7 @@ impl Client {
|
|||||||
.span(Dir::DOWN)
|
.span(Dir::DOWN)
|
||||||
.add_static(&mut ui);
|
.add_static(&mut ui);
|
||||||
|
|
||||||
let texts = Span::empty(Dir::DOWN)
|
let texts = Span::empty(Dir::DOWN).gap(10).add_static(&mut ui);
|
||||||
.gap(10)
|
|
||||||
.add_static(&mut ui);
|
|
||||||
let msg_area = texts.scroll().masked().background(rect(Color::SKY));
|
let msg_area = texts.scroll().masked().background(rect(Color::SKY));
|
||||||
let add_text = text("add")
|
let add_text = text("add")
|
||||||
.editable()
|
.editable()
|
||||||
@@ -190,7 +188,7 @@ impl Client {
|
|||||||
.edit_on(CursorSense::HoverEnd, move |r, _| {
|
.edit_on(CursorSense::HoverEnd, move |r, _| {
|
||||||
r.color = color;
|
r.color = color;
|
||||||
});
|
});
|
||||||
(rect, text(label).size(30)).stack()
|
(rect, text(label).size(30).text_align(Align::CENTER)).stack()
|
||||||
};
|
};
|
||||||
|
|
||||||
let tabs = (
|
let tabs = (
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ impl Widget for Scroll {
|
|||||||
self.amt = self.content_len - self.container_len;
|
self.amt = self.content_len - self.container_len;
|
||||||
}
|
}
|
||||||
self.update_amt();
|
self.update_amt();
|
||||||
let region = UiRegion::FULL.offset(Vec2::from_axis(self.axis, -self.amt, 0.0));
|
let mut region = UiRegion::FULL.offset(Vec2::from_axis(self.axis, -self.amt, 0.0));
|
||||||
|
region.axis_mut(self.axis).end = region.axis(self.axis).start.offset(self.content_len);
|
||||||
painter.widget_within(&self.inner, region);
|
painter.widget_within(&self.inner, region);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ impl Default for TextAttrs {
|
|||||||
line_height: size * 1.2,
|
line_height: size * 1.2,
|
||||||
family: Family::SansSerif,
|
family: Family::SansSerif,
|
||||||
wrap: false,
|
wrap: false,
|
||||||
align: Align::CENTER,
|
align: Align::CENTER_LEFT,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user