From 76efb6367145635adfbc531f03eb7f909b0fbc2b Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Tue, 17 May 2022 08:32:23 -0700
Subject: much better help color and copy

---
 main.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/main.lua b/main.lua
index 42399d6..f3618cf 100644
--- a/main.lua
+++ b/main.lua
@@ -1074,7 +1074,7 @@ function draw_help_without_mouse_pressed(drawing)
   local y = drawing.y+10
   love.graphics.print("Things you can do:", 16+30,y, 0, zoom)
   y = y+15*zoom
-  love.graphics.print("* Press the mouse button to start drawing a "..current_shape_singular(), 16+30,y, 0, zoom)
+  love.graphics.print("* Press the mouse button to start drawing a "..current_shape(), 16+30,y, 0, zoom)
   y = y+15*zoom
   love.graphics.print("* Hover on a point and press 'ctrl+v' to start moving it,", 16+30,y, 0, zoom)
   y = y+15*zoom
@@ -1110,34 +1110,34 @@ function draw_help_without_mouse_pressed(drawing)
   y = y+15*zoom
   love.graphics.print("Hit 'esc' now to hide this message", 16+30,y, 0, zoom)
   y = y+15*zoom
-  love.graphics.rectangle('line', 16,drawing.y, drawingw, math.max(pixels(drawing.h),y-drawing.y))
+  love.graphics.setColor(0,0.5,0, 0.1)
+  love.graphics.rectangle('fill', 16,drawing.y, drawingw, math.max(pixels(drawing.h),y-drawing.y))
 end
 
 function draw_help_with_mouse_pressed(drawing)
   love.graphics.setColor(0,0.5,0)
-  love.graphics.rectangle('line', 16,drawing.y, drawingw,pixels(drawing.h))
   local y = drawing.y+10
-  love.graphics.print("You're currently drawing "..current_shape_pluralized(), 16+30,y, 0, zoom)
+  love.graphics.print("You're currently drawing a "..current_shape(drawing.pending), 16+30,y, 0, zoom)
   y = y+15*zoom
   love.graphics.print('Things you can do now:', 16+30,y, 0, zoom)
   y = y+15*zoom
   if current_mode == 'freehand' then
-    love.graphics.print('* Release the mouse button to finish drawing a freehand stroke', 16+30,y, 0, zoom)
+    love.graphics.print('* Release the mouse button to finish drawing the stroke', 16+30,y, 0, zoom)
     y = y+15*zoom
   elseif current_mode == 'line' or current_mode == 'manhattan' then
-    love.graphics.print('* Release the mouse button to finish drawing a line', 16+30,y, 0, zoom)
+    love.graphics.print('* Release the mouse button to finish drawing the line', 16+30,y, 0, zoom)
     y = y+15*zoom
   elseif current_mode == 'circle' then
     if drawing.pending.mode == 'circle' then
-      love.graphics.print('* Release the mouse button to finish drawing a full circle', 16+30,y, 0, zoom)
+      love.graphics.print('* Release the mouse button to finish drawing the circle', 16+30,y, 0, zoom)
       y = y+15*zoom
       love.graphics.print("* Press 'a' to draw just an arc of a circle", 16+30,y, 0, zoom)
     else
-      love.graphics.print('* Release the mouse button to finish drawing an arc', 16+30,y, 0, zoom)
+      love.graphics.print('* Release the mouse button to finish drawing the arc', 16+30,y, 0, zoom)
     end
     y = y+15*zoom
   elseif current_mode == 'polygon' then
-    love.graphics.print('* Release the mouse button to finish drawing a polygon', 16+30,y, 0, zoom)
+    love.graphics.print('* Release the mouse button to finish drawing the polygon', 16+30,y, 0, zoom)
     y = y+15*zoom
     love.graphics.print("* Press 'p' to add a vertex to the polygon", 16+30,y, 0, zoom)
     y = y+15*zoom
@@ -1161,24 +1161,24 @@ function draw_help_with_mouse_pressed(drawing)
     love.graphics.print("* Press 'g' to switch to drawing polygons", 16+30,y, 0, zoom)
     y = y+15*zoom
   end
+  love.graphics.setColor(0,0.5,0, 0.1)
+  love.graphics.rectangle('fill', 16,drawing.y, drawingw, math.max(pixels(drawing.h),y-drawing.y))
 end
 
-function current_shape_singular()
+function current_shape(shape)
   if current_mode == 'freehand' then
     return 'freehand stroke'
   elseif current_mode == 'line' then
     return 'straight line'
   elseif current_mode == 'manhattan' then
     return 'horizontal/vertical line'
+  elseif current_mode == 'circle' and shape and shape.start_angle then
+    return 'arc'
   else
     return current_mode
   end
 end
 
-function current_shape_pluralized()
-  return current_shape_singular()..'s'
-end
-
 _bullet_indent = nil
 function bullet_indent()
   if _bullet_indent == nil then
-- 
cgit 1.4.1-2-gfad0

d='n51' href='#n51'>51</a>
<a id='n52' href='#n52'>52</a>
<a id='n53' href='#n53'>53</a>
<a id='n54' href='#n54'>54</a>
<a id='n55' href='#n55'>55</a>
<a id='n56' href='#n56'>56</a>
<a id='n57' href='#n57'>57</a>
<a id='n58' href='#n58'>58</a>
<a id='n59' href='#n59'>59</a>
<a id='n60' href='#n60'>60</a>
<a id='n61' href='#n61'>61</a>
<a id='n62' href='#n62'>62</a>
<a id='n63' href='#n63'>63</a>
<a id='n64' href='#n64'>64</a>
<a id='n65' href='#n65'>65</a>
<a id='n66' href='#n66'>66</a>
<a id='n67' href='#n67'>67</a>
<a id='n68' href='#n68'>68</a>
<a id='n69' href='#n69'>69</a>
<a id='n70' href='#n70'>70</a>
<a id='n71' href='#n71'>71</a>
<a id='n72' href='#n72'>72</a>
<a id='n73' href='#n73'>73</a>
<a id='n74' href='#n74'>74</a>
<a id='n75' href='#n75'>75</a>
<a id='n76' href='#n76'>76</a>
<a id='n77' href='#n77'>77</a>
<a id='n78' href='#n78'>78</a>
<a id='n79' href='#n79'>79</a>
<a id='n80' href='#n80'>80</a>
<a id='n81' href='#n81'>81</a>
<a id='n82' href='#n82'>82</a>
<a id='n83' href='#n83'>83</a>
<a id='n84' href='#n84'>84</a>
<a id='n85' href='#n85'>85</a>
<a id='n86' href='#n86'>86</a>
<a id='n87' href='#n87'>87</a>
<a id='n88' href='#n88'>88</a>
<a id='n89' href='#n89'>89</a>
<a id='n90' href='#n90'>90</a>
<a id='n91' href='#n91'>91</a>
<a id='n92' href='#n92'>92</a>
<a id='n93' href='#n93'>93</a>
<a id='n94' href='#n94'>94</a>
<a id='n95' href='#n95'>95</a>
<a id='n96' href='#n96'>96</a>
<a id='n97' href='#n97'>97</a>
<a id='n98' href='#n98'>98</a>
<a id='n99' href='#n99'>99</a>
<a id='n100' href='#n100'>100</a>
<a id='n101' href='#n101'>101</a>
</pre></td>
<td class='lines'><pre><code>