mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 10:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use a different fit mode for tooltips

Browse source
This commit is contained in:
Antonio Scandurra 2022-06-15 16:44:08 +02:00
parent f2a48c6b02
commit 8a146e49ca
3 changed files with 39 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/context_menu/src/context_menu.rs
View file

@ -94,7 +94,7 @@ impl View for ContextMenu {
Overlay::new(expanded_menu)
.hoverable(true)
.move_to_fit(true)
.fit_mode(OverlayFitMode::SnapToWindow)
.with_abs_position(self.position)
.boxed()
}

52
crates/gpui/src/elements/overlay.rs
View file

@ -1,25 +1,31 @@
use serde_json::json;
use crate::{
geometry::{rect::RectF, vector::Vector2F},
json::ToJson,
DebugContext, Element, ElementBox, Event, EventContext, LayoutContext, MouseRegion,
PaintContext, SizeConstraint,
};
use serde_json::json;
pub struct Overlay {
child: ElementBox,
abs_position: Option<Vector2F>,
move_to_fit: bool,
fit_mode: OverlayFitMode,
hoverable: bool,
}
#[derive(Copy, Clone)]
pub enum OverlayFitMode {
SnapToWindow,
FlipAlignment,
None,
}
impl Overlay {
pub fn new(child: ElementBox) -> Self {
Self {
child,
abs_position: None,
move_to_fit: false,
fit_mode: OverlayFitMode::None,
hoverable: false,
}
}
@ -29,8 +35,8 @@ impl Overlay {
self
}
pub fn move_to_fit(mut self, align_to_fit: bool) -> Self {
self.move_to_fit = align_to_fit;
pub fn fit_mode(mut self, fit_mode: OverlayFitMode) -> Self {
self.fit_mode = fit_mode;
self
}
@ -76,18 +82,32 @@ impl Element for Overlay {
});
}
if self.move_to_fit {
// Snap the right edge of the overlay to the right edge of the window if
// its horizontal bounds overflow.
if bounds.lower_right().x() > cx.window_size.x() {
bounds.set_origin_x((cx.window_size.x() - bounds.width()).max(0.));
}
match self.fit_mode {
OverlayFitMode::SnapToWindow => {
// Snap the right edge of the overlay to the right edge of the window if
// its horizontal bounds overflow.
if bounds.lower_right().x() > cx.window_size.x() {
bounds.set_origin_x((cx.window_size.x() - bounds.width()).max(0.));
}
// Snap the bottom edge of the overlay to the bottom edge of the window if
// its vertical bounds overflow.
if bounds.lower_right().y() > cx.window_size.y() {
bounds.set_origin_y((cx.window_size.y() - bounds.height()).max(0.));
// Snap the bottom edge of the overlay to the bottom edge of the window if
// its vertical bounds overflow.
if bounds.lower_right().y() > cx.window_size.y() {
bounds.set_origin_y((cx.window_size.y() - bounds.height()).max(0.));
}
}
OverlayFitMode::FlipAlignment => {
// Right-align overlay if its horizontal bounds overflow.
if bounds.lower_right().x() > cx.window_size.x() {
bounds.set_origin_x(bounds.origin_x() - bounds.width());
}
// Bottom-align overlay if its vertical bounds overflow.
if bounds.lower_right().y() > cx.window_size.y() {
bounds.set_origin_y(bounds.origin_y() - bounds.height());
}
}
OverlayFitMode::None => {}
}
self.child.paint(bounds.origin(), bounds, cx);

4
crates/gpui/src/elements/tooltip.rs
View file

@ -1,6 +1,6 @@
use super::{
ContainerStyle, Element, ElementBox, Flex, KeystrokeLabel, MouseEventHandler, Overlay,
ParentElement, Text,
OverlayFitMode, ParentElement, Text,
};
use crate::{
fonts::TextStyle,
@ -79,7 +79,7 @@ impl Tooltip {
})
.boxed(),
)
.move_to_fit(true)
.fit_mode(OverlayFitMode::FlipAlignment)
.with_abs_position(state.position.get())
.boxed(),
)