From 3582432fc725a2435feda058014973dbf431fe18 Mon Sep 17 00:00:00 2001 From: Keavon Chambers Date: Sat, 20 Feb 2021 19:42:07 -0800 Subject: [PATCH] Window title bar now draws for Windows, Mac, Linux, and Web --- .../src/components/header/HeaderBar.vue | 45 -------------- .../components/panel-system/DockablePanel.vue | 10 +++- .../src/components/window/MainWindow.vue | 29 +++++++--- .../footer-bar}/FooterBar.vue | 2 +- .../footer-bar}/InputHint.vue | 0 .../{header => window/title-bar}/FileMenu.vue | 9 ++- .../components/window/title-bar/TitleBar.vue | 58 +++++++++++++++++++ .../window/title-bar/WindowButtonsMac.vue | 45 ++++++++++++++ .../title-bar/WindowButtonsWindows.vue} | 10 ++-- .../title-bar}/WindowTitle.vue | 8 ++- 10 files changed, 152 insertions(+), 64 deletions(-) delete mode 100644 web-frontend/src/components/header/HeaderBar.vue rename web-frontend/src/components/{footer => window/footer-bar}/FooterBar.vue (93%) rename web-frontend/src/components/{footer => window/footer-bar}/InputHint.vue (100%) rename web-frontend/src/components/{header => window/title-bar}/FileMenu.vue (92%) create mode 100644 web-frontend/src/components/window/title-bar/TitleBar.vue create mode 100644 web-frontend/src/components/window/title-bar/WindowButtonsMac.vue rename web-frontend/src/components/{header/WindowButtons.vue => window/title-bar/WindowButtonsWindows.vue} (75%) rename web-frontend/src/components/{header => window/title-bar}/WindowTitle.vue (68%) diff --git a/web-frontend/src/components/header/HeaderBar.vue b/web-frontend/src/components/header/HeaderBar.vue deleted file mode 100644 index 2b7a04d3..00000000 --- a/web-frontend/src/components/header/HeaderBar.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - - - diff --git a/web-frontend/src/components/panel-system/DockablePanel.vue b/web-frontend/src/components/panel-system/DockablePanel.vue index 9216f213..e1c296dc 100644 --- a/web-frontend/src/components/panel-system/DockablePanel.vue +++ b/web-frontend/src/components/panel-system/DockablePanel.vue @@ -3,7 +3,11 @@
{{tabLabel}} - +
@@ -70,7 +74,7 @@ overflow-x: hidden; white-space: nowrap; text-overflow: ellipsis; - // Required because https://stackoverflow.com/a/21611191/775283 + // Height and line-height required because https://stackoverflow.com/a/21611191/775283 height: 100%; line-height: 28px; } @@ -88,10 +92,12 @@ font-size: 10px; border-radius: 2px; margin-left: 8px; + fill: #ddd; &:hover { background: #555; color: white; + fill: white; } } diff --git a/web-frontend/src/components/window/MainWindow.vue b/web-frontend/src/components/window/MainWindow.vue index 760b2fca..f8cea704 100644 --- a/web-frontend/src/components/window/MainWindow.vue +++ b/web-frontend/src/components/window/MainWindow.vue @@ -1,12 +1,12 @@