little fixes.

nagolove · Jun 18, 2021 · 93fdca5 · 93fdca5
1 parent 19b4d3a
commit 93fdca5
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 18 deletions.
diff --git a/fonts.lua b/fonts.lua
@@ -11,7 +11,7 @@ local t = {
    help = {
       font = lg.newFont(
       SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
-      baseSize + 2),
+      baseSize + 20),
 
       gooi = lg.newFont(
       SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
@@ -33,6 +33,7 @@ local t = {
    baseSize + 2),
 
    nback = {
+
       font = love.graphics.newFont(
       SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
       baseSize + 12),
@@ -47,16 +48,17 @@ local t = {
 
       setupmenu = lg.newFont(
       SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
-      baseSize + 17),
+      baseSize + 35),
 
    },
+
    languageSelector = love.graphics.newFont(
    SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
-   baseSize + 12),
+   baseSize + 35),
 
    menu = love.graphics.newFont(
    SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
-   baseSize + 19),
+   baseSize + 35),
 
 }
 

diff --git a/fonts.tl b/fonts.tl
@@ -11,7 +11,7 @@ local t = {
     help = {
         font = lg.newFont(
             SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
-            baseSize + 2
+            baseSize + 20
         ),
         gooi = lg.newFont(
             SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
@@ -33,6 +33,7 @@ local t = {
         baseSize + 2
     ),
     nback = {
+        -- где используется?
         font = love.graphics.newFont(
             SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
             baseSize + 12
@@ -47,16 +48,17 @@ local t = {
         ),
         setupmenu = lg.newFont(
             SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
-            baseSize + 17
+            baseSize + 35
         ),
     },
+    -- выбор языка
     languageSelector = love.graphics.newFont(
         SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
-        baseSize + 12
+        baseSize + 35
     ),
     menu = love.graphics.newFont(
         SCENEPREFIX .. "gfx/DejaVuSansMono.ttf",
-        baseSize + 19
+        baseSize + 35
     ),
 }
 

diff --git a/help.lua b/help.lua
@@ -159,12 +159,16 @@ end
 
 function Help:mousepressed(_, _, _, _)
    print("help:mousepressed()")
-   self.mainMenuBtn:mousePressed()
+   if self.mainMenuBtn.mousePressed then
+      self.mainMenuBtn:mousePressed()
+   end
 end
 
 function Help:mousereleased(_, _, _, _)
    print("help:mousereleased()")
-   self.mainMenuBtn:mouseReleased()
+   if self.mainMenuBtn.mouseReleased then
+      self.mainMenuBtn:mouseReleased()
+   end
 end
 
 function Help:keypressed(key)
@@ -174,8 +178,5 @@ function Help:keypressed(key)
    end
 end
 
-
-
-
 help = Help.new()
 print('hello from bottom of Help module.')
diff --git a/help.tl b/help.tl
@@ -159,12 +159,16 @@ end
 
 function Help:mousepressed(_: number, _: number, _: number, _: boolean)
     print("help:mousepressed()")
-    self.mainMenuBtn:mousePressed()
+    if self.mainMenuBtn.mousePressed then
+        self.mainMenuBtn:mousePressed()
+    end
 end
 
 function Help:mousereleased(_: number, _: number, _: number, _: boolean)
     print("help:mousereleased()")
-    self.mainMenuBtn:mouseReleased()
+    if self.mainMenuBtn.mouseReleased then
+        self.mainMenuBtn:mouseReleased()
+    end
 end
 
 function Help:keypressed(key: string)
@@ -174,8 +178,5 @@ function Help:keypressed(key: string)
     end
 end
 
---return {
-    --new = Help.new
---}
 global help = Help.new()
 print('hello from bottom of Help module.')
diff --git a/languageselector.lua b/languageselector.lua
@@ -170,6 +170,8 @@ function LanguageSelector:keypressed(key)
    elseif key == "space" or key == "return" then
       print("select")
       self.locale = self.languages[self.selected].locale
+   elseif key == "escape" then
+      love.event.quit()
    end
 end
 

diff --git a/languageselector.tl b/languageselector.tl
@@ -170,6 +170,8 @@ function LanguageSelector:keypressed(key: string)
     elseif key == "space" or key == "return" then
         print("select")
         self.locale = self.languages[self.selected].locale
+    elseif key == "escape" then
+        love.event.quit()
     end
 end