enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-29 20:32:03 +03:00
Code Issues Projects Releases Wiki Activity

Change order of objects to avoid scrollbar over visualisation chooser (#5843)

Browse Source 
Fixes the scrollbar of the text visualization overlaying the visualization chooser.  Fixes #5089
Also fixes the scrollbar not overlaying the visualization action bar.

https://user-images.githubusercontent.com/1428930/223997913-3a9c84ae-6675-4f8e-b2e2-99c9e9c98565.mp4
This commit is contained in:
Michael Mauderer 2023-03-14 13:27:37 +00:00 committed by GitHub
parent 5c6a5dcf60
commit 8201c1c845
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/gui/view/graph-editor/src/builtin/visualization/native/text_visualization.rs
View File

@ -165,8 +165,8 @@ impl<T: 'static> Model<T> {
self.root.add_child(&self.scroll_bar_vertical);
self.scroll_bar_vertical.set_rotation_z(-90.0_f32.to_radians());
self.app.display.default_scene.layers.above_nodes_text.add(&self.scroll_bar_horizontal);
self.app.display.default_scene.layers.above_nodes_text.add(&self.scroll_bar_vertical);
self.app.display.default_scene.layers.main.add(&self.scroll_bar_horizontal);
self.app.display.default_scene.layers.main.add(&self.scroll_bar_vertical);
}
fn set_size(&self, size: Vector2) {

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

@ -291,6 +291,7 @@ impl ContainerModel {
fn init(self) -> Self {
self.display_object.add_child(&self.drag_root);
self.scene.layers.above_nodes.add(&self.action_bar);
self.update_shape_sizes();
self.init_corner_roundness();

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

@ -269,8 +269,6 @@ impl Model {
let icons = Icons::new();
let shapes = compound::events::MouseEvents::default();
app.display.default_scene.layers.below_main.add(&hover_area);
app.display.default_scene.layers.below_main.add(&background);
app.display.default_scene.layers.above_nodes.add(&icons);
shapes.add_sub_shape(&hover_area);

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

@ -60,7 +60,7 @@ struct Model {
impl Model {
pub fn new(app: &Application, registry: visualization::Registry) -> Self {
let selection_menu = drop_down_menu::DropDownMenu::new(app);
app.display.default_scene.layers.below_main.add(&selection_menu);
app.display.default_scene.layers.above_nodes.add(&selection_menu);
Self { selection_menu, registry }
}

3
lib/rust/ensogl/component/list-view/src/entry/list.rs
View File

@ -84,7 +84,8 @@ impl<E, P: Default> ListData<E, P> {
let entry_params = default();
let display_object = display::object::Instance::new();
let provider = default();
let label_layer = Rc::new(RefCell::new(app.display.default_scene.layers.label.downgrade()));
let label_layer =
Rc::new(RefCell::new(app.display.default_scene.layers.above_nodes_text.downgrade()));
Self { app, display_object, entries, entries_range, entry_params, provider, label_layer }
}
}