Merge pull request #55 from werererer/development

Development
werererer · Jan 15, 2023 · 9cdc208 · 9cdc208
2 parents 8e14dcf + 48b321d
commit 9cdc208
Show file tree

Hide file tree

Showing 64 changed files with 2,577 additions and 705 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ build/**
 *-protocol.h
 .ccls-cache
 .vimspector.json
+callgrind.*
 tags
 *.pdf
 vscjlsymserv-*

diff --git a/config/init.lua b/config/init.lua
@@ -42,7 +42,7 @@ layout:set_master_layout_data(
 )
 
 -- You can define which layouts are switch to by default here
-local layouts = {"three_columns", "two_pane", "monocle"}
+local layouts = {"tmp", "two_pane", "monocle"}
 server.default_layout_ring = Ring.new(layouts)
 opt.default_layout = layouts[1]
 

diff --git a/config/layouts/master/init.lua b/config/layouts/master/init.lua
@@ -63,17 +63,17 @@ local layout_data = {
         {0.0, 0.6, 0.2, 0.4},
     },
 }
-
-local resize_data = {
-    {1},
-    {2},
-    {3, 4},
-    {5},
-    {6, 7, 8, 9},
-}
-
 layout:set(layout_data)
-l.config:set_resize_data(resize_data)
+
+local resize_groups = {}
+resize_groups[1] = {
+        {1},
+        {2},
+        {3, 4},
+        {5},
+        {6, 7, 8, 9},
+    }
+l.config:set_resize_data(resize_groups)
 l.config:set_master_layout_data(
 {{{0, 0, 1, 1}}, {{0, 0, 0.5, 1}, {0.5, 0, 0.5, 1}}}
 )

diff --git a/config/layouts/tmp/init.lua b/config/layouts/tmp/init.lua
@@ -119,6 +119,8 @@ local layout_data = {
 }
 
 layout:set(layout_data)
-l.config.set_resize_data({{2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}})
-l.config.set_resize_direction(info.direction.all)
-l.config.set_resize_function(Resize_all)
+local resize_groups = {}
+resize_groups[1] = {{2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}}
+layout:set_resize_data(resize_groups)
+opt.resize_direction = Direction.all
+print("works")
diff --git a/config/layouts/two_pane/init.lua b/config/layouts/two_pane/init.lua
@@ -11,7 +11,17 @@ local layout_data = {
 local function update(layout)
 end
 
+local resize_data = {
+    {
+        {1, 2, 3, 4, 5, 6}
+    },
+    {
+        {1, 2, 3, 4, 5, 6}
+    },
+}
+
 layout:set(layout_data)
+layout:set_resize_data(resize_data)
 event:add_listener("on_update", update)
 layout:set_linked_layouts({"three_columns"})
 layout:set_master_layout_data(