From d49b19c32e54d936bb4671aa6aa5885b2284dc68 Mon Sep 17 00:00:00 2001 From: kovacsv Date: Fri, 5 Nov 2021 18:14:19 +0100 Subject: [PATCH] Modify navigator style sheet. --- website/o3dv/css/panelset.css | 9 +++++++-- website/o3dv/css/website.css | 2 +- website/o3dv/js/navigator.js | 6 ++++++ website/o3dv/js/panelset.js | 21 ++++++++++++++++++--- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/website/o3dv/css/panelset.css b/website/o3dv/css/panelset.css index cb11317..53f3ae1 100644 --- a/website/o3dv/css/panelset.css +++ b/website/o3dv/css/panelset.css @@ -1,7 +1,5 @@ div.ov_panel_set_menu { - margin-right: 10px; - border-right: 1px solid var(--ov_border_color); float: left; } @@ -11,6 +9,13 @@ div.ov_panel_set_menu div.ov_panel_set_menu_button cursor: pointer; } +div.ov_panel_set_content +{ + padding-left: 10px; + border-left: 1px solid var(--ov_border_color); + overflow: auto; +} + @media (hover) { diff --git a/website/o3dv/css/website.css b/website/o3dv/css/website.css index 37a806a..4bf07ec 100644 --- a/website/o3dv/css/website.css +++ b/website/o3dv/css/website.css @@ -104,7 +104,7 @@ div.main div.main_navigator { width: 240px; - margin: 10px 0px 10px 10px; + margin: 10px 0px 10px 0px; overflow: none; float: left; } diff --git a/website/o3dv/js/navigator.js b/website/o3dv/js/navigator.js index ee38841..80a7e6d 100644 --- a/website/o3dv/js/navigator.js +++ b/website/o3dv/js/navigator.js @@ -157,8 +157,14 @@ OV.Navigator = class { if (selection.type === OV.SelectionType.Material) { navigator.materialsPanel.GetMaterialItem (selection.materialIndex).SetSelected (select); + if (select) { + navigator.panelSet.ShowPanel (navigator.materialsPanel); + } } else if (selection.type === OV.SelectionType.Mesh) { navigator.meshesPanel.GetMeshItem (selection.meshInstanceId).SetSelected (select); + if (select) { + navigator.panelSet.ShowPanel (navigator.meshesPanel); + } } } diff --git a/website/o3dv/js/panelset.js b/website/o3dv/js/panelset.js index 2a35f4d..a9c7697 100644 --- a/website/o3dv/js/panelset.js +++ b/website/o3dv/js/panelset.js @@ -3,8 +3,8 @@ OV.Panel = class constructor (parentDiv) { this.parentDiv = parentDiv; - this.panelDiv = $('
').appendTo (parentDiv); - this.visible = true; + this.panelDiv = $('
').appendTo (parentDiv).hide (); + this.visible = false; } GetIcon () @@ -17,6 +17,11 @@ OV.Panel = class return this.panelDiv; } + IsVisible () + { + return this.visible; + } + Show (show) { this.visible = show; @@ -44,7 +49,7 @@ OV.PanelSet = class { this.parentDiv = parentDiv; this.menuDiv = $('
').addClass ('ov_panel_set_menu').appendTo (parentDiv); - this.contentDiv = $('
').appendTo (parentDiv); + this.contentDiv = $('
').addClass ('ov_panel_set_content').appendTo (parentDiv); this.panels = []; } @@ -71,6 +76,16 @@ OV.PanelSet = class panel.Resize (); } + GetVisiblePanel () + { + for (let panel of this.panels) { + if (panel.IsVisible ()) { + return panel; + } + } + return null; + } + Resize () { let height = this.parentDiv.height ();