Use resizable split

Author: ArthurSonzogni

CMakeLists.txt

@@ -6,7 +6,7 @@ include(FetchContent)
 set(FETCHCONTENT_UPDATES_DISCONNECTED TRUE)
 FetchContent_Declare(ftxui
   GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui
-  GIT_TAG aacb677e8449429b3dd96d9822065253c201a86b
+  GIT_TAG 462664520ae20ccc6121c9ed706d49aa00fd73d0
   )
 
 FetchContent_GetProperties(ftxui)

src/diff.cpp

@@ -265,25 +265,32 @@ int main(int argc, const char** argv) {
   auto scroller = Scroller(
       Renderer([&] { return Render(files[file_menu_selected], split); }));
 
-  auto container = Container::Horizontal({
-      file_menu,
-      scroller,
+  auto file_menu_renderer = Renderer(file_menu, [&] {
+    return vbox({
+        text(L" Files "),
+        separator(),
+        file_menu->Render(),
+    });
   });
 
-  container = Renderer(container, [&] {
+  auto file_renderer = Renderer(scroller, [&, file_menu] {
     const File& file = files[file_menu_selected];
-    return hbox({
-               window(text(L" Files "), file_menu->Render()) |
-                   size(WIDTH, LESS_THAN, 30),
-               vbox({
-                   window(
-                       text(L" Difference "),
-                       vbox({text(file.left_file + L" -> " + file.right_file),
-                             separator(), scroller->Render()})),
-                   filler(),
-               }) | xflex_shrink,
+    return vbox({
+               text(L" Difference "),
+               separator(),
+               text(file.left_file + L" -> " + file.right_file),
+               separator(),
+               scroller->Render(),
            }) |
-           bgcolor(Color::RGB(30, 30, 30)) | yflex;
+           flex;
+  });
+
+  int file_menu_width = 30;
+  auto layout =
+      ResizableSplitLeft(file_menu_renderer, file_renderer, &file_menu_width);
+
+  auto layout_renderer = Renderer(layout, [&] {
+    return layout->Render() | bgcolor(Color::RGB(30, 30, 30)) | yflex;
   });
 
   auto options = Container::Horizontal({
@@ -306,12 +313,12 @@ int main(int argc, const char** argv) {
            bgcolor(Color::White) | color(Color::Black);
   });
 
-  container = Container::Vertical({
+  auto main_container = Container::Vertical({
       option_renderer,
-      container,
+      layout_renderer,
   });
 
-  container = CatchEvent(container, [&](Event event) {
+  auto final_container = CatchEvent(main_container, [&](Event event) {
     if (event == Event::Character('s')) {
       split = !split;
       return true;
@@ -333,12 +340,12 @@ int main(int argc, const char** argv) {
   file_menu->TakeFocus();
 
   auto screen = ScreenInteractive::Fullscreen();
-  screen.Loop(container);
+  screen.Loop(final_container);
 
   return EXIT_SUCCESS;
 }
 
-}  // namespace diff
+}  // namespace gittui::diff
 
 // Copyright 2021 Arthur Sonzogni. All rights reserved.
 // Use of this source code is governed by the MIT license that can be found in

src/log.cpp

@@ -154,6 +154,7 @@ int main(int argc, const char** argv) {
       menu_files_entries.push_back(file.right_file);
   };
   refresh_files();
+
   auto menu_files = Menu(&menu_files_entries, &menu_files_index);
   MenuBase::From(menu_commit)->on_change = [&] {
     refresh_files();
@@ -251,42 +252,44 @@ int main(int argc, const char** argv) {
            bgcolor(Color::White) | color(Color::Black);
   });
 
-  auto container = Container::Vertical({
-      options,
-      Container::Horizontal({
-          menu_commit,
-          menu_files,
-          scroller,
-      }),
+  menu_files = Renderer(menu_files, [menu_files] {
+    return vbox({
+        text(L"Commit"),
+        separator(),
+        menu_files->Render() | size(WIDTH, EQUAL, 25) | yframe,
+    });
   });
 
-  auto renderer = Renderer(container, [&] {
+  menu_commit = Renderer(menu_commit, [menu_commit] {
     return vbox({
-        option_renderer->Render(),
-        hbox({
-            vbox({
-                text(L"Commit"),
-                separator(),
-                menu_commit->Render() | size(WIDTH, EQUAL, 25) | yframe,
-            }),
-            separator(),
-            vbox({
-                text(L"Files"),
-                separator(),
-                menu_files->Render() | size(WIDTH, EQUAL, 25) | yframe,
-            }),
-            separator(),
-            vbox({
-                text(L"Content"),
-                separator(),
-                scroller->Render() | xflex,
-            }) | xflex,
-        }) | yflex |
-            nothing,
+        text(L"Files"),
+        separator(),
+        menu_commit->Render() | size(WIDTH, EQUAL, 25) | yframe,
     });
   });
 
-  renderer = CatchEvent(renderer, [&](Event event) {
+  scroller = Renderer(scroller, [scroller] {
+    return vbox({
+        text(L"Content"),
+        separator(),
+        scroller->Render() | flex,
+    });
+  });
+
+  int menu_commit_width = 25;
+  int menu_files_width = 25;
+
+  auto container = scroller;
+  container = ResizableSplitLeft(menu_files, container, &menu_files_width);
+  container = ResizableSplitLeft(menu_commit, container, &menu_commit_width);
+  container =
+      Renderer(container, [container] { return container->Render() | flex; });
+  container = Container::Vertical({
+      option_renderer,
+      container,
+  });
+
+  container = CatchEvent(container, [&](Event event) {
     refresh_commit_list();
 
     if (event == Event::Character('s')) {
@@ -314,7 +317,7 @@ int main(int argc, const char** argv) {
 
   menu_commit->TakeFocus();
 
-  screen.Loop(renderer);
+  screen.Loop(container);
   return EXIT_SUCCESS;
 }