Check overriding file, tool bar

canvas.go

@@ -1,7 +1,9 @@
 package main
 
 import (
+	"errors"
 	"fmt"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -100,12 +102,16 @@ func (c *Canvas) Draw() {
 	)
 }
 
-func (c *Canvas) Save() {
+func (c *Canvas) Save(force bool) {
 	c.Name = strings.Trim(c.Name, " ")
 
+	// check if the name is empty
 	if c.Name == "" {
 		addToast("Please enter a file name!")
-	} else {
+		return
+	}
+	// check if file already exists, sorry for lazy
+	if _, err := os.Stat(filepath.Join(dirUserData, c.Name+".png")); errors.Is(err, os.ErrNotExist) {
 		image := raylib.LoadImageFromTexture(c.Target.Texture)
 
 		raylib.ImageRotate(image, 180)
@@ -114,6 +120,18 @@ func (c *Canvas) Save() {
 		raylib.ExportImage(*image, filepath.Join(dirUserData, c.Name+".png"))
 
 		addToast("Drawing saved as " + c.Name + ".png")
+	} else if force {
+		image := raylib.LoadImageFromTexture(c.Target.Texture)
+
+		raylib.ImageRotate(image, 180)
+		raylib.ImageFlipHorizontal(image)
+
+		raylib.ExportImage(*image, filepath.Join(dirUserData, c.Name+".png"))
+
+		addToast("Drawing saved as " + c.Name + ".png")
+	} else {
+		applicationState = StateFileExists
+
 	}
 
 	c.UnsavedChanges = false

main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"math"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -14,8 +13,7 @@ import (
 
 func main() {
 	// Initialize raylib
-	raylib.SetConfigFlags(raylib.FlagWindowResizable | raylib.FlagWindowHighdpi | raylib.FlagMsaa4xHint)
+	raylib.SetConfigFlags(raylib.FlagWindowResizable | raylib.FlagMsaa4xHint) // raylib.FlagWindowHighdpi
-	// raylib.SetConfigFlags(raylib.FlagWindowResizable | raylib.FlagMsaa4xHint)
 	raylib.InitWindow(applicationWindowWidth, applicationWindowHeight, applicationTitle)
 	raylib.SetWindowMinSize(int(applicationMinWindowWidth), int(applicationMinWindowHeight)) // Set a minimum window size
 	raylib.SetTargetFPS(int32(raylib.GetMonitorRefreshRate(raylib.GetCurrentMonitor())))     // Match monitor refresh rate
@@ -48,11 +46,11 @@ func main() {
 		if raylib.WindowShouldClose() {
 			applicationState = StateWindowWantsToDie
 		}
-		if raylib.IsWindowResized() {
+
-			applicationWindowWidth = int32(raylib.GetScreenWidth())
+		applicationWindowWidth = int32(raylib.GetScreenWidth())
-			applicationWindowHeight = int32(raylib.GetScreenHeight())
+		applicationWindowHeight = int32(raylib.GetScreenHeight())
-			toolPanelOffset = applicationWindowWidth - int32(toolPanelWidth)
+		toolBarOffset = applicationWindowWidth - toolBarWidth
-		}
+		toolPanelOffset = applicationWindowWidth - toolPanelWidth - toolBarWidth
 
 		// Create new canvas if needed
 		if shouldCreateNewCanvas {
@@ -81,7 +79,7 @@ func main() {
 		{
 			if applicationState == StateNormal {
 				if raylib.IsKeyPressed(raylib.KeyF1) {
-					newStrokeType = toolNone
+					newStrokeType = toolPointer
 					addToast("Tool: None")
 				}
 				if raylib.IsKeyPressed(raylib.KeyF2) {
@@ -103,7 +101,7 @@ func main() {
 			switch newStrokeType {
 			case toolPen:
 				if raylib.IsMouseButtonPressed(raylib.MouseLeftButton) && applicationState == StateNormal {
-					if !raylib.CheckCollisionPointRec(raylib.GetMousePosition(), raylib.NewRectangle(float32(applicationWindowWidth-int32(toolPanelWidth)), 0, toolPanelWidth, float32(applicationWindowHeight))) &&
+					if (!raylib.CheckCollisionPointRec(raylib.GetMousePosition(), raylib.NewRectangle(float32(toolPanelOffset), 0, float32(toolPanelWidth+toolBarWidth), float32(applicationWindowHeight))) || !toolBarShowPanel) &&
 						raylib.CheckCollisionPointRec(raylib.GetMousePosition(), raylib.NewRectangle(10, 10, canvas.Size.X, canvas.Size.Y)) {
 						applicationState = StateDrawing
 						newPenStroke = penTool{
@@ -119,8 +117,6 @@ func main() {
 					} else if raylib.Vector2Distance(newPenStroke.Points[len(newPenStroke.Points)-1], raylib.GetMousePosition()) > float32(newStrokeSafeZone) {
 						newPenStroke.Points = append(newPenStroke.Points, raylib.GetMousePosition())
 					}
-
-					applicationState = StateDrawing
 				}
 
 				if raylib.IsMouseButtonReleased(raylib.MouseLeftButton) && newPenStroke.Points != nil {
@@ -128,7 +124,7 @@ func main() {
 					newPenStroke = penTool{}
 					applicationState = StateNormal
 				}
-			case toolNone:
+			case toolPointer:
 				fallthrough
 			default:
 				// yyeeeeet
@@ -139,16 +135,13 @@ func main() {
 			} else if raylib.IsKeyDown(raylib.KeyLeftControl) && raylib.IsKeyPressed(raylib.KeyZ) {
 				canvas.Undo()
 			} else if raylib.IsKeyDown(raylib.KeyLeftControl) && raylib.IsKeyPressed(raylib.KeyS) {
-				canvas.Save()
+				canvas.Save(false)
 			}
 		}
 
 		// UPDATE
 		{
 			applicationRuntime += 1
-			if math.Mod(float64(applicationRuntime), 1) == 0 {
-				// ToDo: check cursor color contrast with background
-			}
 
 			if applicationState != StateNormal {
 				gui.Lock()
@@ -179,37 +172,77 @@ func main() {
 			}
 
 			// Tool Panel
-			raylib.BeginScissorMode(toolPanelOffset, 0, int32(toolPanelWidth), applicationWindowHeight)
+			raylib.BeginScissorMode(toolBarOffset, 0, toolBarWidth, applicationWindowHeight)
 			{
-				raylib.DrawRectangle(toolPanelOffset, 0, int32(toolPanelWidth), applicationWindowHeight, raylib.Fade(raylib.White, 0.9))
+				raylib.DrawRectangle(toolBarOffset, 0, toolBarWidth, applicationWindowHeight, raylib.Fade(raylib.White, 0.9))
 
-				if gui.Button(raylib.NewRectangle(float32(toolPanelOffset+10), 10, 25, 25), gui.IconText(gui.ICON_FOLDER_OPEN, "")) {
+				// Top
-					applicationState = StateFileMenu
+
-				}
+				if gui.Button(raylib.NewRectangle(float32(toolBarOffset+10), 10, 25, 25), gui.IconText(gui.ICON_BURGER_MENU, "")) {
-				if gui.Button(raylib.NewRectangle(float32(toolPanelOffset+20+25), 10, 25, 25), gui.IconText(gui.ICON_FOLDER_SAVE, "")) {
+					toolBarShowPanel = !toolBarShowPanel
-					canvas.Save()
 				}
 
-				if gui.Button(raylib.NewRectangle(float32(applicationWindowWidth-70), 10, 25, 25), gui.IconText(gui.ICON_UNDO, "")) {
+				if newStrokeType == toolPointer {
-					canvas.Undo()
+					gui.SetState(gui.STATE_PRESSED)
 				}
-				if gui.Button(raylib.NewRectangle(float32(applicationWindowWidth-35), 10, 25, 25), gui.IconText(gui.ICON_REDO, "")) {
+				if gui.Button(raylib.NewRectangle(float32(toolBarOffset+10), 45, 25, 25), gui.IconText(gui.ICON_CURSOR_CLASSIC, "")) {
-					canvas.Redo()
+					newStrokeType = toolPointer
+					addToast("Tool: Pointer")
+				}
+				gui.SetState(gui.STATE_NORMAL)
+
+				if newStrokeType == toolPen {
+					gui.SetState(gui.STATE_PRESSED)
+				}
+				if gui.Button(raylib.NewRectangle(float32(toolBarOffset+10), 80, 25, 25), gui.IconText(gui.ICON_PENCIL, "")) {
+					newStrokeType = toolPen
+					addToast("Tool: Pen")
+				}
+				gui.SetState(gui.STATE_NORMAL)
+
+				// Bottom
+				if gui.Button(raylib.NewRectangle(float32(toolBarOffset+10), float32(applicationWindowHeight-35), 25, 25), gui.IconText(gui.ICON_INFO, "")) {
+					applicationState = StateHelp
 				}
 
-				toolPanelColourPicker = gui.ColorPicker(raylib.NewRectangle(float32(toolPanelOffset+10), 45, toolPanelWidth-45, toolPanelColourPickerHeight), "Color", toolPanelColourPicker)
+				raylib.DrawLine(toolBarOffset, 0, toolBarOffset, applicationWindowHeight, raylib.Black)
-
-				gui.Label(raylib.NewRectangle(float32(toolPanelOffset+10), 55+toolPanelColourPickerHeight, 60, 20), "Brush Size")
-				toolPanelBrushSize = gui.Slider(raylib.NewRectangle(float32(toolPanelOffset+80), 55+toolPanelColourPickerHeight, toolPanelWidth-90, 20), "", "", toolPanelBrushSize, 1, 100)
-
-				gui.Label(raylib.NewRectangle(float32(toolPanelOffset+10), 115+toolPanelColourPickerHeight, 60, 20), "File Name")
-				if gui.TextBox(raylib.NewRectangle(float32(toolPanelOffset+80), 115+toolPanelColourPickerHeight, toolPanelWidth-90, 20), &canvas.Name, 40, isEditingCanvasName) {
-					isEditingCanvasName = !isEditingCanvasName
-				}
-				raylib.DrawLine(toolPanelOffset, 0, toolPanelOffset, applicationWindowHeight, raylib.Black)
 			}
 			raylib.EndScissorMode()
 
+			// Tool Panel
+			if toolBarShowPanel {
+				raylib.BeginScissorMode(toolPanelOffset, 0, toolPanelWidth, applicationWindowHeight)
+				{
+					raylib.DrawRectangle(toolPanelOffset, 0, toolPanelWidth, applicationWindowHeight, raylib.Fade(raylib.White, 0.9))
+
+					if gui.Button(raylib.NewRectangle(float32(toolPanelOffset+10), 10, 25, 25), gui.IconText(gui.ICON_FOLDER_OPEN, "")) {
+						applicationState = StateFileMenu
+					}
+					if gui.Button(raylib.NewRectangle(float32(toolPanelOffset+20+25), 10, 25, 25), gui.IconText(gui.ICON_FOLDER_SAVE, "")) {
+						canvas.Save(false)
+					}
+
+					if gui.Button(raylib.NewRectangle(float32(applicationWindowWidth-70-toolBarWidth), 10, 25, 25), gui.IconText(gui.ICON_UNDO, "")) {
+						canvas.Undo()
+					}
+					if gui.Button(raylib.NewRectangle(float32(applicationWindowWidth-35-toolBarWidth), 10, 25, 25), gui.IconText(gui.ICON_REDO, "")) {
+						canvas.Redo()
+					}
+
+					toolPanelColourPicker = gui.ColorPicker(raylib.NewRectangle(float32(toolPanelOffset+10), 45, float32(toolPanelWidth-45), toolPanelColourPickerHeight), "Color", toolPanelColourPicker)
+
+					gui.Label(raylib.NewRectangle(float32(toolPanelOffset+10), 55+toolPanelColourPickerHeight, 60, 20), "Brush Size")
+					toolPanelBrushSize = gui.Slider(raylib.NewRectangle(float32(toolPanelOffset+80), 55+toolPanelColourPickerHeight, float32(toolPanelWidth-90), 20), "", "", toolPanelBrushSize, 1, 100)
+
+					gui.Label(raylib.NewRectangle(float32(toolPanelOffset+10), 115+toolPanelColourPickerHeight, 60, 20), "File Name")
+					if gui.TextBox(raylib.NewRectangle(float32(toolPanelOffset+80), 115+toolPanelColourPickerHeight, float32(toolPanelWidth-90), 20), &canvas.Name, 40, isEditingCanvasName) {
+						isEditingCanvasName = !isEditingCanvasName
+					}
+					raylib.DrawLine(toolPanelOffset, 0, toolPanelOffset, applicationWindowHeight, raylib.Black)
+				}
+				raylib.EndScissorMode()
+			}
+
 			// Debug Values
 			if applicationShowDebugValues {
 				var text string
@@ -327,6 +360,27 @@ func main() {
 					shouldCreateNewCanvas = true
 					addToast("Created New Canvas: " + canvas.Name)
 				}
+			case StateHelp:
+				gui.Unlock()
+				raylib.DrawRectangle(0, 0, applicationWindowWidth, applicationWindowHeight, raylib.Fade(raylib.Black, 0.5))
+				windowPos := raylib.NewRectangle(float32((applicationWindowWidth/2)-200), float32((applicationWindowHeight/2)-75), 400, 150)
+				choice := gui.MessageBox(windowPos, "Help", fmt.Sprintf("ColouringApp %s", Version), "Close")
+
+				if choice == 0 || choice == 1 {
+					applicationState = StateNormal
+				}
+			case StateFileExists:
+				gui.Unlock()
+				raylib.DrawRectangle(0, 0, applicationWindowWidth, applicationWindowHeight, raylib.Fade(raylib.Black, 0.5))
+				windowPos := raylib.NewRectangle(float32((applicationWindowWidth/2)-200), float32((applicationWindowHeight/2)-75), 400, 150)
+				choice := gui.MessageBox(windowPos, "File Exists", "File already exists, are you sure you want to save?", "No;Yes")
+
+				if choice == 0 || choice == 1 {
+					applicationState = StateNormal
+				} else if choice == 2 {
+					canvas.Save(true)
+					applicationState = StateNormal
+				}
 			case StateWindowWantsToDie:
 				if !canvas.UnsavedChanges {
 					applicationShouldQuit = true
@@ -352,16 +406,26 @@ func main() {
 			}
 
 			// Cursor
-			switch newStrokeType {
+			if raylib.IsCursorOnScreen() {
-			case toolNone:
+				switch newStrokeType {
-				raylib.DrawTriangleLines(
+				case toolPointer:
-					raylib.NewVector2(raylib.GetMousePosition().X, raylib.GetMousePosition().Y),
+					// Points have to be provided in counter-clockwise order for some reason ??!?!??!?!?
-					raylib.NewVector2(raylib.GetMousePosition().X+10, raylib.GetMousePosition().Y+10),
+					raylib.DrawTriangle(
-					raylib.NewVector2(raylib.GetMousePosition().X, raylib.GetMousePosition().Y+14),
+						raylib.NewVector2(raylib.GetMousePosition().X+2, raylib.GetMousePosition().Y+14),
-					cursorColor,
+						raylib.NewVector2(raylib.GetMousePosition().X+10, raylib.GetMousePosition().Y+10),
-				)
+						raylib.NewVector2(raylib.GetMousePosition().X, raylib.GetMousePosition().Y),
-			case toolPen:
+						raylib.White,
-				raylib.DrawCircleLines(int32(raylib.GetMousePosition().X), int32(raylib.GetMousePosition().Y), toolPanelBrushSize/2, cursorColor)
+					)
+					// Here they don't!
+					raylib.DrawTriangleLines(
+						raylib.NewVector2(raylib.GetMousePosition().X, raylib.GetMousePosition().Y),
+						raylib.NewVector2(raylib.GetMousePosition().X+10, raylib.GetMousePosition().Y+10),
+						raylib.NewVector2(raylib.GetMousePosition().X+2, raylib.GetMousePosition().Y+14),
+						raylib.Black,
+					)
+				case toolPen:
+					raylib.DrawCircleLines(int32(raylib.GetMousePosition().X), int32(raylib.GetMousePosition().Y), toolPanelBrushSize/2, raylib.Black)
+				}
 			}
 
 			drawToasts()

vars.go

@@ -2,6 +2,8 @@ package main
 
 import raylib "github.com/gen2brain/raylib-go/raylib"
 
+const Version = "0.1.0"
+
 const (
 	applicationTitle           = "Colouring App"
 	applicationMinWindowWidth  = int32(800)
@@ -20,11 +22,13 @@ const (
 	StateDrawing
 	StateFileMenu
 	StateNewCanvas
+	StateHelp
+	StateFileExists
 	StateWindowWantsToDie
 )
 
 const (
-	toolNone = iota
+	toolPointer = iota
 	toolPen
 )
 
@@ -38,14 +42,20 @@ var (
 )
 
 var (
-	cursorColor = raylib.Black
+	newStrokeType     = toolPen
-
-	newStrokeType     = toolNone
 	newPenStroke      = penTool{}
 	newStrokeSafeZone = 1
+)
 
-	toolPanelWidth  = float32(350)
+var (
-	toolPanelOffset = applicationWindowWidth - int32(toolPanelWidth)
+	toolBarWidth     = int32(45)
+	toolBarOffset    = applicationWindowWidth - toolBarWidth
+	toolBarShowPanel = true
+)
+
+var (
+	toolPanelWidth  = int32(350)
+	toolPanelOffset = applicationWindowWidth - toolPanelWidth - toolBarWidth
 
 	toolPanelColourPicker       = raylib.Orange
 	toolPanelColourPickerHeight = float32(250)