From 05bfac2221307cd195fa02a9ba5d664ab5c7fb33 Mon Sep 17 00:00:00 2001
From: jill <oatmealine@disroot.org>
Date: Sat, 18 Sep 2021 01:51:42 +0300
Subject: [PATCH] unhardcore some rendering constants

---
 dropdown.lua | 30 +++++++++++++++---------------
 graph.lua    |  4 ++--
 main.lua     | 12 ++++++------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/dropdown.lua b/dropdown.lua
index 0b4b60a..8a3bff5 100644
--- a/dropdown.lua
+++ b/dropdown.lua
@@ -54,9 +54,9 @@ function self.createDropdowns()
   local d = {}
   dropdownId = 0
   insertDropdown(d, {
-    x = padding,
-    y = padding,
-    width = 128,
+    x = outerpadding,
+    y = outerpadding,
+    width = dropdownWidth,
     options = {
       'Preview Ease',
       'Mix Eases',
@@ -67,34 +67,34 @@ function self.createDropdowns()
 
   if d[dropdownId].selected == 1 then -- preview ease
     insertDropdown(d, {
-      x = padding + 128 + padding,
-      y = padding,
-      width = 128,
+      x = outerpadding + dropdownWidth + padding,
+      y = outerpadding,
+      width = dropdownWidth,
       options = skeys(ease.eases),
       name = 'ease1'
     })
     ease.ease = ease.eases[d[dropdownId].options[d[dropdownId].selected]].f
   elseif d[dropdownId].selected == 2 then -- mix eases
     insertDropdown(d, {
-      x = padding + 128 + padding,
-      y = padding,
-      width = 128,
+      x = outerpadding + dropdownWidth + padding,
+      y = outerpadding,
+      width = dropdownWidth,
       options = skeys(ease.eases),
       name = 'ease1'
     })
     insertDropdown(d, {
-      x = padding + 128 + padding + 128 + padding,
-      y = padding,
-      width = 128,
+      x = outerpadding + dropdownWidth + padding + dropdownWidth + padding,
+      y = outerpadding,
+      width = dropdownWidth,
       options = skeys(ease.eases),
       name = 'ease2'
     })
     ease.ease = ease.mixEase(ease.eases[d[dropdownId - 1].options[d[dropdownId - 1].selected]].f, ease.eases[d[dropdownId].options[d[dropdownId].selected]].f, mixpoint)
   elseif d[dropdownId].selected == 3 then -- create eases
     insertDropdown(d, {
-      x = padding + 128 + padding,
-      y = padding,
-      width = 128,
+      x = outerpadding + dropdownWidth + padding,
+      y = outerpadding,
+      width = dropdownWidth,
       options = skeys(ease.eases),
       name = 'ease1'
     })
diff --git a/graph.lua b/graph.lua
index 62b6ac9..0ae893d 100644
--- a/graph.lua
+++ b/graph.lua
@@ -25,9 +25,9 @@ function self.render()
 
   if mode == 1 or mode == 2 then
     local csize = 10 -- preview point size
-    local size = math.min((sw - padding) - ((dropdown.kget('ease2') or dropdown.kget('ease1')).x + 128 + padding), sh - padding * 5 - csize)
+    local size = math.min((sw - outerpadding) - ((dropdown.kget('ease2') or dropdown.kget('ease1')).x + dropdownWidth + padding), sh - outerpadding * 2 - padding * 3 - csize)
 
-    local x, y, w, h = sw - padding - size, padding, size, size
+    local x, y, w, h = sw - outerpadding - size, outerpadding, size, size
     love.graphics.setColor(1, 1, 1, 1)
     love.graphics.rectangle('line', x, y, w, h)
 
diff --git a/main.lua b/main.lua
index b113fd9..a7faa9b 100644
--- a/main.lua
+++ b/main.lua
@@ -10,12 +10,12 @@ graph = require 'graph'
 
 require 'util' -- exports into global table
 
--- eases
-
 -- rendering constants
 
-padding = 6
-margin = 4
+padding = 14
+outerpadding = 22
+margin = 6
+dropdownWidth = 106
 
 -- slider
 
@@ -58,13 +58,13 @@ function love.draw()
   love.graphics.rectangle('line', 0, 0, sw, sh)
 
   love.graphics.setColor(1, 1, 1, 1)
-  love.graphics.print('Box of Eases by oatmealine', padding, sh - love.graphics.getFont():getHeight() - padding)
+  love.graphics.print('Box of Eases by oatmealine', outerpadding, sh - love.graphics.getFont():getHeight() - outerpadding)
 
   -- sliders
   -- yeah we do a lil' hardcoding
 
   if mode == 2 then
-    local x, y, w, h = padding, padding * 2 + love.graphics.getFont():getHeight() + margin, 128, 32
+    local x, y, w, h = outerpadding, outerpadding * 2 + love.graphics.getFont():getHeight() + margin, dropdownWidth, 32
 
     love.graphics.setColor(0.7, 0.7, 0.7, 0.4)
     love.graphics.line(x, y + h/2, x + w, y + h/2)