about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2023-01-01 18:05:29 -0800
committerKartik K. Agaram <vc@akkartik.com>2023-01-01 18:05:29 -0800
commitf611eabad811d552146398e3c8ad877f50a65bbe (patch)
tree2f821a3e847a54a9a77cd4db7096fc70853c1f37
parentfc86ecb69e7d0add33164341a03758c275d7252f (diff)
parentc7de47440b96f03e3eabe43ea0f46b894ebd86d7 (diff)
downloadtext.love-f611eabad811d552146398e3c8ad877f50a65bbe.tar.gz
Merge lines.love
-rw-r--r--run.lua4
-rw-r--r--source.lua2
2 files changed, 3 insertions, 3 deletions
diff --git a/run.lua b/run.lua
index 1f7126f..3062611 100644
--- a/run.lua
+++ b/run.lua
@@ -56,7 +56,7 @@ function run.load_settings()
   -- set up desired window dimensions
   App.screen.flags.resizable = true
   App.screen.flags.minwidth = math.min(App.screen.width, 200)
-  App.screen.flags.minheight = math.min(App.screen.width, 200)
+  App.screen.flags.minheight = math.min(App.screen.height, 200)
   App.screen.width, App.screen.height = Settings.width, Settings.height
   love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)
   love.window.setPosition(Settings.x, Settings.y, Settings.displayindex)
@@ -87,7 +87,7 @@ function run.initialize_window_geometry(em_width)
   App.screen.width = 40*em_width
   App.screen.flags.resizable = true
   App.screen.flags.minwidth = math.min(App.screen.width, 200)
-  App.screen.flags.minheight = math.min(App.screen.width, 200)
+  App.screen.flags.minheight = math.min(App.screen.height, 200)
   love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)
 end
 
diff --git a/source.lua b/source.lua
index c3bd85b..0d12415 100644
--- a/source.lua
+++ b/source.lua
@@ -172,7 +172,7 @@ function source.initialize_window_geometry(em_width)
   App.screen.width = 40*em_width
   App.screen.flags.resizable = true
   App.screen.flags.minwidth = math.min(App.screen.width, 200)
-  App.screen.flags.minheight = math.min(App.screen.width, 200)
+  App.screen.flags.minheight = math.min(App.screen.height, 200)
   App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)
   print('initializing source position')
   if Settings == nil then Settings = {} end