feat(Windows): custom titlebar (onivim#1801)

* Titlebar: Added custom titlebar for Windows * Dependencies: dune=2.4.0 revery=8b399ed * Titlebar: wire up buttons to respective functions * Root: add WindowResizers for Windows [WIP] * WindowResizers: refactor into a component * Images: add titlebar icon * WindowResizers: removed background colors * Titlebar: use new icon * Titlebar: fix `esy b dune build @check` errors * Formatting Co-authored-by: Bryan Phelps <[email protected]>
IAteNoodles-Linux · May 23, 2020 · fd19667 · fd19667
1 parent 4b24747
commit fd19667
Show file tree

Hide file tree

Showing 18 changed files with 1,460 additions and 45 deletions.
diff --git a/assets/fonts/codicon.ttf b/assets/fonts/codicon.ttf
diff --git a/assets/fonts/dune b/assets/fonts/dune
@@ -1,4 +1,4 @@
 (install
     (section bin)
     (package Oni2)
-    (files Inconsolata-Bold.ttf Inconsolata-Regular.ttf Inter-UI-Medium.ttf Inter-UI-MediumItalic.ttf Inter-UI-Regular.ttf Inter-UI-Italic.ttf Inter-UI-SemiBoldItalic.ttf Inter-UI-SemiBold.ttf Inter-UI-Bold.ttf FiraCode-Regular.ttf FontAwesome5FreeRegular.otf FontAwesome5FreeSolid.otf selawk.ttf selawkb.ttf selawkl.ttf selawksb.ttf selawksl.ttf seti.ttf))
+    (files Inconsolata-Bold.ttf Inconsolata-Regular.ttf Inter-UI-Medium.ttf Inter-UI-MediumItalic.ttf Inter-UI-Regular.ttf Inter-UI-Italic.ttf Inter-UI-SemiBoldItalic.ttf Inter-UI-SemiBold.ttf Inter-UI-Bold.ttf FiraCode-Regular.ttf FontAwesome5FreeRegular.otf FontAwesome5FreeSolid.otf selawk.ttf selawkb.ttf selawkl.ttf selawksb.ttf selawksl.ttf seti.ttf codicon.ttf))
diff --git a/assets/images/dune b/assets/images/dune
@@ -1,4 +1,4 @@
 (install
     (section bin)
     (package Oni2)
-    (files logo.png background-grid.png title-logo.png))
+    (files logo.png logo-titlebar.png background-grid.png title-logo.png))
diff --git a/assets/images/logo-titlebar.png b/assets/images/logo-titlebar.png
diff --git a/bench.esy.lock/opam/dune.2.4.0/opam b/bench.esy.lock/opam/dune.2.4.0/opam
diff --git a/esy.lock/opam/dune.2.4.0/opam b/esy.lock/opam/dune.2.4.0/opam
diff --git a/integration_test/lib/Oni_IntegrationTestLib.re b/integration_test/lib/Oni_IntegrationTestLib.re
@@ -34,9 +34,15 @@ let setVsync = vsync => _currentVsync := vsync;
 
 let maximize = () => _currentMaximized := true;
 let minimize = () => _currentMinimized := true;
+let restore = () => {
+  _currentMaximized := false;
+  _currentMinimized := false;
+};
 
 let quit = code => exit(code);
 
+let close = () => quit(0) |> ignore;
+
 exception TestAssetNotFound(string);
 
 let getAssetPath = path =>
@@ -165,6 +171,8 @@ let runTest =
       ~setVsync,
       ~maximize,
       ~minimize,
+      ~restore,
+      ~close,
       ~executingDirectory=Revery.Environment.getExecutingDirectory(),
       ~getState=() => currentState^,
       ~onStateChanged,

diff --git a/integrationtest.esy.lock/opam/dune.2.4.0/opam b/integrationtest.esy.lock/opam/dune.2.4.0/opam