enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-11-22 22:10:15 +03:00
Code Issues Projects Releases Wiki Activity

Two fixes: hidden CB entry and scrolling in text vis. (#7475)

Browse Source 
Fixes #7405 
Fixes #7445 

The "hidden entry" bug was caused by wrong component browser position and size set when all displayed entries fit the viewport.

The scrolling issue was due to change various "hover rectangles" order - some were above the scroll bars.
This commit is contained in:
Adam Obuchowicz 2023-08-04 14:55:25 +02:00 committed by GitHub
parent bc9cde6543
commit 6534d0a925
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 69 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/gui/view/component-browser/component-list-panel/grid/src/lib.rs
View File

@ -416,14 +416,14 @@ impl Model {
// === Updating Style ===
impl Model {
fn grid_size((style, content_size): &(Style, Vector2)) -> Vector2 {
fn grid_size((style, content_size, top_margin): &(Style, Vector2, f32)) -> Vector2 {
let x = min(style.content_size().x, content_size.x);
let y = min(style.content_size().y, content_size.y);
let y = min(style.content_size().y, content_size.y + top_margin);
Vector2(x, y)
}
fn grid_position(input: &(Style, Vector2)) -> Vector2 {
let (style, _) = input;
fn grid_position(input: &(Style, Vector2, f32)) -> Vector2 {
let (style, _, _) = input;
let y = -style.content_size().y + Self::grid_size(input).y;
Vector2(style.padding_x, y)
}
@ -511,15 +511,15 @@ impl component::Frp<Model> for Frp {
// === Style and Entries Params ===
style_and_content_size <- all(&style, &grid.content_size);
size_and_position_factors <- all(style, grid.content_size, input.set_top_margin);
entries_style <-
all4(&style, &entry_style, &colors, &group_colors);
entries_params <- entries_style.map(f!((s) model.entries_params(s)));
selection_entries_style <- all(entries_params, selection_colors);
selection_entries_params <-
selection_entries_style.map(f!((input) model.selection_entries_params(input)));
grid_scroll_frp.resize <+ style_and_content_size.map(Model::grid_size);
grid_position <- style_and_content_size.map(Model::grid_position);
grid_scroll_frp.resize <+ size_and_position_factors.map(Model::grid_size);
grid_position <- size_and_position_factors.map(Model::grid_position);
eval grid_position ((pos) model.grid.set_xy(*pos));
corners_radius <- style.map(|s| s.corners_radius);
grid_scroll_frp.set_corner_radius_bottom_right <+ corners_radius;

2
app/gui/view/graph-editor/src/builtin/visualization/native/text_grid.rs
View File

@ -1,2 +0,0 @@

93
app/gui/view/graph-editor/src/component/visualization/container.rs
View File

@ -31,7 +31,6 @@ use ensogl::application::Application;
use ensogl::control::io::mouse;
use ensogl::data::color::Rgba;
use ensogl::display;
use ensogl::display::scene;
use ensogl::display::scene::Scene;
use ensogl::display::scene::Shape;
use ensogl::display::shape::StyleWatchFrp;
@ -180,11 +179,11 @@ ensogl::define_endpoints_2! {
pub struct View {
display_object: display::object::Instance,
selection: Rectangle,
overlay: Rectangle,
hover_area: Rectangle,
/// Resize grip is a rectangle with the size of the container but with a slight offset from the
/// overlay shape so that it extends beyond the container at the bottom and right sides.
/// The ordering of `overlay`, `selection`, and `resize_grip` is controlled by partition layers
/// (see [`View::init`]).
/// `hover_area` shape so that it extends beyond the container at the bottom and right sides.
/// The ordering of `hover_area`, `selection`, and `resize_grip` is controlled by partition
/// layers (see [`View::init`]).
resize_grip: Rectangle,
// TODO : We added a HTML background to the `View`, because "shape" background was
// overlapping the JS visualization. This should be further investigated
@ -201,15 +200,15 @@ impl View {
let selection = Rectangle::default().build(|r| {
r.set_color(Rgba::transparent());
});
let overlay = Rectangle::default().build(|r| {
let hover_area = Rectangle::default().build(|r| {
r.set_color(INVISIBLE_HOVER_COLOR).set_border_color(INVISIBLE_HOVER_COLOR);
});
let resize_grip = Rectangle::default().build(|r| {
r.set_color(INVISIBLE_HOVER_COLOR).set_border_color(INVISIBLE_HOVER_COLOR);
});
display_object.add_child(&selection);
selection.add_child(&overlay);
overlay.add_child(&resize_grip);
selection.add_child(&hover_area);
hover_area.add_child(&resize_grip);
let div = web::document.create_div_or_panic();
let background_dom = DomSymbol::new(&div);
display_object.add_child(&background_dom);
@ -218,7 +217,7 @@ impl View {
Self {
display_object,
selection,
overlay,
hover_area,
resize_grip,
background_dom,
scene,
@ -244,7 +243,7 @@ impl View {
}
fn set_corner_radius(&self, radius: f32) {
self.overlay.set_corner_radius(radius);
self.hover_area.set_corner_radius(radius);
self.selection.set_corner_radius(radius);
let radius = format!("{radius}px");
self.background_dom.dom().set_style_or_warn("border-radius", radius);
@ -288,7 +287,7 @@ impl View {
self.scene.layers.viz.add(&self);
self.scene.layers.viz_selection.add(&self.selection);
self.scene.layers.viz_resize_grip.add(&self.resize_grip);
self.scene.layers.viz_overlay.add(&self.overlay);
self.scene.layers.viz_hover_area.add(&self.hover_area);
self
}
}
@ -492,15 +491,16 @@ impl ContainerModel {
let dom = self.view.background_dom.dom();
let bg_dom = self.fullscreen_view.background_dom.dom();
if view_state.is_fullscreen() {
self.view.overlay.set_size(Vector2(0.0, 0.0));
self.view.hover_area.set_size(Vector2(0.0, 0.0));
dom.set_style_or_warn("width", "0");
dom.set_style_or_warn("height", "0");
bg_dom.set_style_or_warn("width", format!("{}px", size[0]));
bg_dom.set_style_or_warn("height", format!("{}px", size[1]));
} else {
self.view.overlay.set_size(size);
// We don't resize `selection` here, because it's handled in "set_selection" method,
// which in turn is called on every size change anyway.
self.view.hover_area.set_size(size);
self.view.resize_grip.set_size(size);
self.view.selection.set_size(size);
self.view.loading_spinner.set_size(size);
dom.set_style_or_warn("width", format!("{}px", size[0]));
dom.set_style_or_warn("height", format!("{}px", size[1]));
@ -521,11 +521,6 @@ impl ContainerModel {
}
}
/// Check if given mouse-event-target means this visualization.
fn is_this_target(&self, target: scene::PointerTargetId) -> bool {
self.view.overlay.is_this_target(target)
}
#[profile(Debug)]
fn next_visualization(
&self,
@ -541,6 +536,35 @@ impl ContainerModel {
});
next_on_list.or_else(|| vis_list.first()).cloned()
}
/// Activate the visualization instance. Returns true if there was an instance to activate.
fn activate(&self) -> bool {
let vis = &self.visualization;
let activate = vis.borrow().as_ref().map(|v| v.activate.clone_ref());
match activate {
Some(activate) => {
activate.emit(());
true
}
None => false,
}
}
fn deactivated_by_click(&self, event: &display::object::Event<mouse::Down>) -> bool {
event.target().map_or(false, |target| {
let vis = &self.visualization;
let vis_area = self.view.hover_area.display_object();
let inside_me = target.rev_parent_chain().iter().any(|instance| instance == vis_area);
let deactivate = vis.borrow().as_ref().map(|v| v.deactivate.clone_ref());
match deactivate {
Some(deactivate) if !inside_me => {
deactivate.emit(());
true
}
_ => false,
}
})
}
}
@ -732,34 +756,21 @@ impl Container {
// === Selecting Visualization ===
let viz_clicked = model.view.hover_area.on_event::<mouse::Down>();
let scene_clicked = scene.on_event::<mouse::Down>();
frp::extend! { network
mouse_down_target <- scene.mouse.frp_deprecated.down.map(f_!(scene.mouse.target.get()));
selected_by_click <= mouse_down_target.map2(&output.view_state, f!([model] (target,view_state){
let vis = &model.visualization;
let activate = || vis.borrow().as_ref().map(|v| v.activate.clone_ref());
let deactivate = || vis.borrow().as_ref().map(|v| v.deactivate.clone_ref());
if model.is_this_target(*target) {
if let Some(activate) = activate() {
activate.emit(());
return Some(true);
}
} else if !view_state.is_fullscreen() {
if let Some(deactivate) = deactivate() {
deactivate.emit(());
return Some(false);
}
}
None
}));
selection_after_click <- selected_by_click.map(|sel| if *sel {1.0} else {0.0});
selection.target <+ selection_after_click;
selected_by_click <- viz_clicked.map(f_!(model.activate()));
deselected_by_click <- scene_clicked.map(f!([model](event) model.deactivated_by_click(event)));
selected <- selected_by_click.on_true();
deselected <- deselected_by_click.on_true();
is_selected <- bool(&deselected, &selected).on_change();
selection.target <+ is_selected.map(|s| if *s { 1.0 } else { 0.0 });
_eval <- selection.value.all_with3(&output.size, &selection_style,
f!((value, size, style) {
model.set_selection(*size, *value, style);
}
));
is_selected <- selected_by_click || output.fullscreen;
output.is_selected <+ is_selected.on_change();
output.is_selected <+ is_selected || output.fullscreen;
}

17
lib/rust/ensogl/core/src/display/scene.rs
View File

@ -783,10 +783,11 @@ pub struct HardcodedLayers {
/// rendered. You should not need to use it directly.
pub DETACHED: Layer,
pub root: Layer,
pub viz: Layer,
pub viz_background: Layer,
pub viz_selection: RectLayerPartition,
pub viz_resize_grip: RectLayerPartition,
pub viz_overlay: RectLayerPartition,
pub viz_hover_area: RectLayerPartition,
pub viz: Layer,
pub below_main: Layer,
pub main: Layer,
pub label: Layer,
@ -826,10 +827,11 @@ impl HardcodedLayers {
let DETACHED = Layer::new("DETACHED");
let root = Layer::new_with_camera("root", &main_cam);
let viz_background = root.create_sublayer("viz_background");
let viz_selection = partition_layer(&viz_background, "viz_selection");
let viz_resize_grip = partition_layer(&viz_background, "viz_resize_grip");
let viz_hover_area = partition_layer(&viz_background, "viz_overlay");
let viz = root.create_sublayer("viz");
let viz_selection = partition_layer(&viz, "viz_selection");
let viz_resize_grip = partition_layer(&viz, "viz_resize_grip");
let viz_overlay = partition_layer(&viz, "viz_overlay");
let below_main = root.create_sublayer("below_main");
let main = root.create_sublayer("main");
let label = root.create_sublayer("label");
@ -855,10 +857,11 @@ impl HardcodedLayers {
Self {
DETACHED,
root,
viz,
viz_background,
viz_selection,
viz_resize_grip,
viz_overlay,
viz_hover_area,
viz,
below_main,
main,
label,