From b6c5531290fc37e9e031149eafeca9eb56886782 Mon Sep 17 00:00:00 2001
From: Robert Jelic <36573031+NoryiE@users.noreply.github.com>
Date: Fri, 26 Aug 2022 21:13:19 +0200
Subject: [PATCH] example changes and cursor bugfix

---
 Basalt/objects/Input.lua              |  3 +++
 Basalt/objects/Textfield.lua          |  4 ++++
 examples/basaltPreview.lua            | 14 +++++++-------
 examples/basaltPreview2.lua           |  7 ++++++-
 examples/basaltPreview2.xml           | 22 +++++++++++-----------
 examples/progressBarEnergyExample.lua | 17 ++++++++---------
 examples/redstoneAnalogOutput.lua     |  2 +-
 7 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/Basalt/objects/Input.lua b/Basalt/objects/Input.lua
index 654481c..32e2e99 100644
--- a/Basalt/objects/Input.lua
+++ b/Basalt/objects/Input.lua
@@ -332,6 +332,9 @@ return function(name)
                             self.parent:writeText(obx, oby + (n - 1), text, bCol, fCol)
                         end
                     end
+                    if(self:isFocused())then
+                        self.parent:setCursor(true, obx + textX - wIndex, oby+math.max(math.ceil(self:getHeight()/2-1, 1)), self.fgColor)
+                    end
                 end
             end
         end,
diff --git a/Basalt/objects/Textfield.lua b/Basalt/objects/Textfield.lua
index c9c59ba..2516e01 100644
--- a/Basalt/objects/Textfield.lua
+++ b/Basalt/objects/Textfield.lua
@@ -596,6 +596,10 @@ return function(name)
                         self.parent:setBG(obx, oby + n - 1, bg)
                         self.parent:setFG(obx, oby + n - 1, fg)
                     end
+                    if(self:isFocused())then
+                        local anchx, anchy = self:getAnchorPosition()
+                        self.parent:setCursor(true, anchx + textX - wIndex, anchy + textY - hIndex, self.fgColor)
+                    end
                 end
             end
         end,
diff --git a/examples/basaltPreview.lua b/examples/basaltPreview.lua
index 5646d46..1018e8d 100644
--- a/examples/basaltPreview.lua
+++ b/examples/basaltPreview.lua
@@ -1,17 +1,17 @@
 --Basalt configurated installer
-local filePath = "basalt.lua" --here you can change the file path default: basalt.lua
+local filePath = "basalt.lua" --here you can change the file path default: basalt
 if not(fs.exists(filePath))then
     shell.run("pastebin run ESs1mg7P packed true "..filePath:gsub(".lua", "")) -- this is an alternative to the wget command
 end
-local basalt = require(filePath:gsub(".lua", "")) -- here you can change the variablename in any variablename you want default: basalt
+local basalt = require(filePath:gsub(".lua", ""))
 
 local w, h = term.getSize()
 
 
-local main = basalt.createFrame("mainFrame"):show()
-local objFrame = main:addFrame("objectFrame"):setPosition(1,2):setBackground(colors.lightGray):setSize(w, h-1):show()
-local programFrame = main:addFrame("programFrame"):setPosition(1,2):setBackground(colors.lightGray):setSize(w, h-1)
-local editorFrame = main:addFrame("editorFrame"):setPosition(1,2):setBackground(colors.lightGray):setSize(w, h-1)
+local main = basalt.createFrame("mainFrame")
+local objFrame = main:addFrame("objectFrame"):setPosition(1,2):setBackground(colors.lightGray):setSize(w, h-1)
+local programFrame = main:addFrame("programFrame"):setPosition(1,2):setBackground(colors.lightGray):setSize(w, h-1):hide()
+local editorFrame = main:addFrame("editorFrame"):setPosition(1,2):setBackground(colors.lightGray):setSize(w, h-1):hide()
 
 local menuBar = main:addMenubar("mainMenuBar"):addItem("Object"):addItem("Program"):addItem("Editor"):setBackground(colors.gray):setSize(w, 1):setSpace(5):setScrollable():show()
 menuBar:onChange(function(self)
@@ -67,7 +67,7 @@ end):start()
 --Program Frame:
 local programCount = 1
 visualButton(programFrame:addButton("exampleButton"):setText("Add Shell"):setSize(13,3):setPosition(2,2):onClick(function()
-    local newProgramWindow = programFrame:addFrame("programFrame"..programCount):setMoveable(true):setBar("Console", colors.black, colors.lightGray):showBar():setPosition(3,3):setSize(26,12):show()
+    local newProgramWindow = programFrame:addFrame("programFrame"..programCount):setMovable(true):setBar("Console", colors.black, colors.lightGray):showBar():setPosition(3,3):setSize(26,12):show()
     local program = newProgramWindow:addProgram("exampleProgram"..programCount):setSize(26,11):setPosition(1,2):setBackground(colors.black):show()
     program:execute("rom/programs/shell.lua")
     programCount = programCount + 1
diff --git a/examples/basaltPreview2.lua b/examples/basaltPreview2.lua
index 5f3da3f..c3b0220 100644
--- a/examples/basaltPreview2.lua
+++ b/examples/basaltPreview2.lua
@@ -1,4 +1,9 @@
-local basalt = require("Basalt")
+--Basalt configurated installer
+local filePath = "basalt.lua" --here you can change the file path default: basalt
+if not(fs.exists(filePath))then
+    shell.run("pastebin run ESs1mg7P packed true "..filePath:gsub(".lua", "")) -- this is an alternative to the wget command
+end
+local basalt = require(filePath:gsub(".lua", ""))
 
 basalt.setVariable("buttonColor", basalt.schedule(function(self) 
     self:setBackground(colors.black)
diff --git a/examples/basaltPreview2.xml b/examples/basaltPreview2.xml
index f544727..bbcbdfe 100644
--- a/examples/basaltPreview2.xml
+++ b/examples/basaltPreview2.xml
@@ -1,9 +1,9 @@
-<frame onScroll="ex1OnScroll" id="example1" width="parent.w" height="parent.w" bg="lightGray" maxScroll="32" scrollable="true">
-    <label text="Objects" font="2" x="16" y="2" />
+<frame id="example1" width="parent.w" height="parent.h" bg="lightGray" scrollable="true">
+    <label text="Objects" font="2" x="16" y="3" />
     <button onClick="buttonColor" onClick="ex2" anchor="topRight" height="1" width="8" x="-7" y="2" text="Next" />
     <button onDrag="dragPosition" x="2" y="6" width="parent.w/2-2" height="5" />
     <button onDrag="dragPosition" x="parent.w/2+1" y="6" width="parent.w/2-2" height="5" />
-    <frame y="13" x="2" width="parent.w/2-2" height="16" bg="black" scrollable="true" importantScroll="true">
+    <frame y="13" x="2" width="parent.w/2-2" height="16" bg="black" scrollable="true">
         <button onClick="buttonColor" width="parent.w-2" x="2" y="2" text="Example Button 1" />
         <button onClick="buttonColor" width="parent.w-2" x="2" y="6" text="Example Button 2" />
         <button onClick="buttonColor" width="parent.w-2" x="2" y="10" text="Example Button 3" />
@@ -11,7 +11,7 @@
         <button onClick="buttonColor" width="parent.w-2" x="2" y="18" text="Example Button 5" />
         <button onClick="buttonColor" width="parent.w-2" x="2" y="22" text="Example Button 6" />
     </frame>
-    <frame y="13" x="parent.w/2+1" width="parent.w/2-2" height="16" bg="black" scrollable="true" importantScroll="true">
+    <frame y="13" x="parent.w/2+1" width="parent.w/2-2" height="16" bg="black" scrollable="true">
         <label x="2" y="2" text="Radios and Checkboxes:" fg="lightGray" />
         <radio x="2" y="4" bg="gray" fg="lightGray" boxBG="black" boxFG="lightGray" selectionBG="black" inactiveBoxBG="black">
                 <item><text>Radio 1</text><x>2</x><y>1</y><bg>black</bg></item>
@@ -29,13 +29,13 @@
     <label x="parent.w/2-7" y="31" zIndex="6" bg="false" text="Progressbar Example" fg="lightGray" />
     <label id="progressLabel" x="3" y="31" zIndex="6" bg="false" text="0%" fg="lightGray" />
     <thread thread="progressTheProgressbar" start="true" />
-    <frame zIndex="16" y="34" x="4" width="32" height="12" moveable="true" bar="true" barText="Moveable Frame" barBG="black" barFG="lightGray" shadow="true">
+    <frame zIndex="16" y="34" x="4" width="32" height="12" movable="true" bar="true" barText="Movable Frame" barBG="black" barFG="lightGray" shadow="true">
         <label x="2" y="3" text="Input:" fg="lightGray" />
         <input default="Default Text" defaultFG="gray" width="parent.w-2" x="2" y="5" bg="black" fg="lightGray" />
         <input default="Only numbers" defaultFG="gray" width="parent.w-2" x="2" y="7" type="number" bg="black" fg="lightGray" />
         <input default="Password" defaultFG="gray" width="parent.w-2" x="2" y="9" type="password" bg="black" fg="lightGray" />
     </frame>
-    <frame zIndex="16" y="36" x="6" width="32" height="12" moveable="true" bar="true" barText="Moveable Frame 2" barBG="black" barFG="lightGray" border="true" borderTop="false">
+    <frame zIndex="16" y="36" x="6" width="32" height="12" movable="true" bar="true" barText="Movable Frame 2" barBG="black" barFG="lightGray" border="true" borderTop="false">
         <label x="2" y="3" text="Dropdowns, Lists and Menubars" fg="lightGray" />
         <dropdown x="2" y="5" bg="black" fg="lightGray">                
             <item><text>Entry 1</text></item>
@@ -71,7 +71,7 @@
     <button onClick="buttonColor" onClick="ex1Top" x="parent.w-12" y="48" text="Top" />
 </frame>
 <frame id="example3" x="parent.w*2+1" width="parent.w" height="parent.h" bg="lightGray" >
-    <label text="Editor" font="2" x="16" y="2" />
+    <label text="Editor" font="2" x="16" y="3" />
     <textfield x="2" y="6" width="parent.w-2" height="parent.h-7"/>
     <frame ignoreOffset="true" id="sidebar" anchor="topRight" x="3" width="14" height="parent.h" bg="black" >
         <button onClick="buttonColor" onClick="closeSidebar" anchor="bottomLeft" width="5" height="1" x="1" y="1" fg="black" bg="gray" text="Close" />
@@ -142,7 +142,7 @@
 </frame>
 
 <frame zIndex="17" id="example4" x="parent.w*3+1" width="parent.w" height="parent.h" bg="lightGray" >
-    <label text="Animations" font="2" x="16" y="2" />
+    <label text="Animations" font="2" x="16" y="3" />
     <button onClick="buttonColor" onClick="ex3" x="2" y="2" width="8" height="1" text="Back" />
 
 
@@ -185,13 +185,13 @@
 </frame>
 
 <frame id="example2" x="parent.w+1" width="parent.w" height="parent.h" bg="lightGray" >
-    <label text="Program" font="2" x="16" y="2" />
+    <label text="Program" font="2" x="16" y="3" />
     <program x="2" y="6" width="parent.w-12" height="parent.h-6" path="rom/programs/shell.lua" execute="true" />
     <button onClick="buttonColor" onClick="p2" anchor="bottomRight" width="8" x="-7" y="-2" text="Down" />
-    <frame moveable="true" bar="true" barText="Program" x="2" y="parent.h+2" width="28" height="12" bg="black" >
+    <frame movable="true" bar="true" barText="Program" x="2" y="parent.h+2" width="28" height="12" bg="black" >
         <program id="program2" x="1" y="2" width="parent.w" height="parent.h-1" path="rom/programs/fun/worm.lua" execute="true" />
     </frame>
-    <frame moveable="true" bar="true" barText="Program" x="6" y="parent.h+4" width="28" height="12" bg="black" >
+    <frame movable="true" bar="true" barText="Program" x="6" y="parent.h+4" width="28" height="12" bg="black" >
         <program id="program2" x="1" y="2" width="parent.w" height="parent.h-1" path="rom/programs/shell.lua" execute="true" />
     </frame>
     <button onClick="buttonColor" onClick="p1" width="8" x="parent.w-8" y="parent.h+2" text="Up" />
diff --git a/examples/progressBarEnergyExample.lua b/examples/progressBarEnergyExample.lua
index f1431aa..ca68795 100644
--- a/examples/progressBarEnergyExample.lua
+++ b/examples/progressBarEnergyExample.lua
@@ -1,30 +1,29 @@
 -- This is a example on how to use progressbars for energy. I used the Mekanism Ultimate Energy Cube.
 
 
-local filePath = "basalt.lua" --here you can change the file path default: basalt.lua
+--Basalt configurated installer
+local filePath = "basalt.lua" --here you can change the file path default: basalt
 if not(fs.exists(filePath))then
-    shell.run("pastebin run ESs1mg7P packed true "..filePath) -- this is an alternative to the wget command
+    shell.run("pastebin run ESs1mg7P packed true "..filePath:gsub(".lua", "")) -- this is an alternative to the wget command
 end
-local basalt = require(filePath:gsub(".lua", "")) -- here you can change the variablename in any variablename you want default: basalt
+local basalt = require(filePath:gsub(".lua", ""))
 
 local energyCube = peripheral.find("ultimateEnergyCube")
 
-local main = basalt.createFrame("main"):show()
+local main = basalt.createFrame()
 
-local progressText = main:addLabel("currentEnergyValue")
+local progressText = main:addLabel()
             :setText(0)
             :setForeground(colors.gray)
             :setBackground(false)
             :setPosition(10, 3)
             :setZIndex(6)
-            :show()
 
-local energyProgress = main:addProgressbar("mainEnergyCube")
+local energyProgress = main:addProgressbar()
             :setSize(20,3)
             :setPosition(2,2)
             :setBackground(colors.black)
             :setProgressBar(colors.green)
-            :show()
 
 energyProgress:onChange(function()
     local energy = tostring(energyCube.getEnergy())
@@ -47,6 +46,6 @@ local function checkCurrentEnergy()
     end
 end
 
-main:addThread("energyThread"):start(checkCurrentEnergy)
+main:addThread():start(checkCurrentEnergy)
 
 basalt.autoUpdate()
diff --git a/examples/redstoneAnalogOutput.lua b/examples/redstoneAnalogOutput.lua
index 41ddc99..f0dd29a 100644
--- a/examples/redstoneAnalogOutput.lua
+++ b/examples/redstoneAnalogOutput.lua
@@ -20,7 +20,7 @@ local sub = main:addFrame()
 local rFrame = sub:addFrame("redstoneFrame")
  :setPosition(1,1)
  :setSize(25,5)
- :setMoveable(true) -- the next release of Basalt will fix spelling to :setMovable
+ :setMovable(true)
  :setBackground(colours.red)
 
 -- Redstone Analog Output