From a707ceaabd095cbc3530e9d9a6be9929c2361bc5 Mon Sep 17 00:00:00 2001 From: 02090095 Date: Thu, 21 Mar 2024 00:15:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B7=D0=B8=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B8=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BF=D1=80=D0=B8=20=D1=80=D0=B0=D1=81=D0=BF?= =?UTF-8?q?=D0=B0=D1=85=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=BB=D0=B0=D1=81=D1=82=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 13 ------------- src/Visual_DVM_2021/UI/Main/FileForm.java | 15 ++------------- src/Visual_DVM_2021/UI/Main/ProjectForm.java | 11 ++++++----- src/Visual_DVM_2021/UI/Main/TestingForm.java | 3 ++- 4 files changed, 10 insertions(+), 32 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4bc0cea0..ed1d01f9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,20 +7,7 @@ - - - - - - - - - - - - - diff --git a/src/Visual_DVM_2021/UI/Main/FileForm.java b/src/Visual_DVM_2021/UI/Main/FileForm.java index 6381ed44..ac78ce4c 100644 --- a/src/Visual_DVM_2021/UI/Main/FileForm.java +++ b/src/Visual_DVM_2021/UI/Main/FileForm.java @@ -368,11 +368,9 @@ public class FileForm implements FileWindow, FormWithSplitters { //-- @Override public void CollapseGraphs() { + Global.db.splitters.get("SC12").position = SC12.getDividerLocation(); UI.Clear(editorBackground); editorBackground.add(editorPanel); - content.updateUI(); - SC1.updateUI(); - SC12.updateUI(); } @Override public void ExpandGraphs() { @@ -381,19 +379,13 @@ public class FileForm implements FileWindow, FormWithSplitters { editorBackground.add(SC12); //-- SC12.setDividerLocation(Global.db.splitters.get("SC12").position); - //-- - content.updateUI(); - SC1.updateUI(); SC12.updateUI(); } @Override public void CollapseMessages() { + Global.db.splitters.get("SC1").position = SC1.getDividerLocation(); UI.Clear(content); content.add(editorBackground); - //-- - content.updateUI(); - SC1.updateUI(); - SC12.updateUI(); } @Override public void ExpandMessages() { @@ -401,9 +393,6 @@ public class FileForm implements FileWindow, FormWithSplitters { SC1.setLeftComponent(editorBackground); content.add(SC1); SC1.setDividerLocation(Global.db.splitters.get("SC1").position); - //-- - content.updateUI(); SC1.updateUI(); - SC12.updateUI(); } } diff --git a/src/Visual_DVM_2021/UI/Main/ProjectForm.java b/src/Visual_DVM_2021/UI/Main/ProjectForm.java index 90fca766..2d8b3656 100644 --- a/src/Visual_DVM_2021/UI/Main/ProjectForm.java +++ b/src/Visual_DVM_2021/UI/Main/ProjectForm.java @@ -106,7 +106,6 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { inlineForm = new TreeForm(InlineTree.class); inlineForm2 = new TreeForm(InlineTree2.class); } - @Override public void RefreshProjectFiles() { filesForm.Refresh(); @@ -168,7 +167,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { @Override public void ShowNoFile() { // projectTabs.setTitleAt(0, "Файл: -"); - projectTabs.setTabComponentAt(0, new TabToolBar("Файл: -"){ + projectTabs.setTabComponentAt(0, new TabToolBar("Файл: -") { @Override public void leftMouseAction() { projectTabs.setSelectedIndex(0); @@ -283,7 +282,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { UI.getVersionsWindow().getContent(), "Версии", 5); } - private void InstallDebugPanel(){ + private void InstallDebugPanel() { projectTabs.insertTab("", Utils.getIcon("/icons/Command.png"), UI.getDebugWindow().getContent(), @@ -296,14 +295,16 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { //-- @Override public void CollapseProjectTrees() { + Global.db.splitters.get("SC3").position = SC3.getDividerLocation(); + //--- UI.Clear(projectBackground); projectBackground.add(fileBackground); - projectBackground.updateUI(); } @Override public void ExpandProjectTrees() { SC3.setLeftComponent(fileBackground); projectBackground.add(SC3); - projectBackground.updateUI(); + SC3.setDividerLocation(Global.db.splitters.get("SC3").position); + SC3.updateUI(); } } \ No newline at end of file diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java index a20b0be4..98263b30 100644 --- a/src/Visual_DVM_2021/UI/Main/TestingForm.java +++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java @@ -304,6 +304,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow { } @Override public void CollapseCredentials() { + Global.db.splitters.get("SC71").position = SC71.getDividerLocation(); UI.Clear(credentialsPanel); credentialsPanel.add(UI.credentialsBar); SC71.setDividerLocation(30); @@ -315,7 +316,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow { public void ExpandCredentials() { UI.Clear(credentialsPanel); credentialsPanel.add(SC18); - SC71.setDividerLocation(200); + SC71.setDividerLocation(Global.db.splitters.get("SC71").position); SC71.setDividerSize(3); credentialsPanel.revalidate(); credentialsPanel.repaint();