more 3ds changes, undo history fixes

Makefile

@@ -5,12 +5,13 @@ APP_AUTHOR 	:= vgmoose
 APP_VERSION := 2.2
 
 SOURCES		+=	. gui edit
-CFLAGS		+= -DUSE_KEYBOARD
+CFLAGS		+= -DUSE_KEYBOARD 
+# -D_3DS_MOCK
 
 ifeq (wiiu,$(MAKECMDGOALS))
 SOURCES 	+= $(CHESTO_DIR)/libs/wiiu_kbd libs/librpxloader/source
 VPATH 		+= $(CHESTO_DIR)/libs/wiiu_kbd
 INCLUDES  	+= ../libs/librpxloader/include
 endif
 
-include libs/chesto/Makefile
+include libs/chesto/Makefile

edit/Editor.cpp

@@ -72,9 +72,9 @@ bool Editor::appendHistory(const char* chars, int pos, bool isDelete)
 {
 	// trim history size to current historyPos (removes future redo's)
 	if (historyPos != undoHistory.size() - 1)
-		undoHistory.erase(undoHistory.begin() + historyPos, undoHistory.end());
-	undoHistory.push_back({ .chars = chars, .isDelete = isDelete, .pos = pos,  });
-	historyPos++;
+		undoHistory.erase(undoHistory.begin() + historyPos + 1, undoHistory.end());
+	undoHistory.push_back({ .chars = std::string(chars), .isDelete = isDelete, .pos = pos,  });
+	historyPos = undoHistory.size() - 1;
 	return true;
 }
 

gui/EditorView.cpp

@@ -10,7 +10,7 @@ EditorView::EditorView(Editor* editor)
 	mainTextField->y = 70;
 	this->elements.push_back(mainTextField);
 
-#if defined(_3DS_MOCK)
+#if defined(_3DS) || defined(_3DS_MOCK)
 	mainTextField->x += 40;
 	mainTextField->y += SCREEN_HEIGHT;
 #endif
@@ -64,7 +64,7 @@ void EditorView::reset_bounds()
 
 	// if this boolean is set, adjust the textfield in the direction of the cursor
 	if (keepCursorOnscreen) {
-#if defined(_3DS_MOCK)
+#if defined(_3DS) || defined(_3DS_MOCK)
 		if (cursor_y > SCREEN_HEIGHT - 150)
 			mainTextField->y -= h/2;
 		if (cursor_y < 50)

gui/FileBrowser.cpp

@@ -2,6 +2,7 @@
 #include "../libs/chesto/src/Button.hpp"
 #include "../libs/chesto/src/TextElement.hpp"
 #include "../libs/chesto/src/Container.hpp"
+#include "../libs/chesto/src/Constraint.hpp"
 #include "FileCard.hpp"
 #include "MainDisplay.hpp"
 #include "TextQueryPopup.hpp"
@@ -27,6 +28,7 @@ FileBrowser::FileBrowser(const char* pwd)
 	cardsPerRow = LISTING_SCREEN_WIDTH / FILE_CARD_WIDTH;
 
 	x = ((SCREEN_WIDTH - (cardsPerRow * FILE_CARD_WIDTH)) / 4);
+	width = -1 * x; // the other margin
 	y = 0;
 
 	listfiles();
@@ -187,7 +189,7 @@ void FileBrowser::listfiles()
 	int count = 0;
 	int topOfList = 115;
 
-#ifdef _3DS_MOCK
+#if defined(_3DS) || defined(_3DS_MOCK)
 	topOfList = SCREEN_HEIGHT / 2 + 40;
 #endif
 
@@ -290,16 +292,15 @@ void FileBrowser::listfiles()
 	}));
 
 	con->position(SCREEN_WIDTH - con->width - this->x * 2, topOfList - 85 / SCALER);
-#ifdef _3DS_MOCK
+#if defined(_3DS) || defined(_3DS_MOCK)
 	con->position(SCREEN_WIDTH / 2 - con->width / 2 - this->x, topOfList - 30);
 	path->position(10 / SCALER, topOfList - 60);
 
 	// for 3ds, the top screen will show the title initially
 	Container* titleCon = new Container(ROW_LAYOUT, 10);
-
-	titleCon->add((new ImageElement(RAMFS "res/icon.jpg"))->setSize(50, 50));
+	titleCon->add((new ImageElement(RAMFS "res/icon_nobg.png"))->setSize(50, 50));
 	titleCon->add(new TextElement("VGEdit", 30, &white));
-	titleCon->position(SCREEN_WIDTH / 2 - con->width / 2, SCREEN_HEIGHT / 4 - con->height);
+	titleCon->constrain(ALIGN_CENTER_HORIZONTAL);
 	this->elements.push_back(titleCon);
 
 #endif

gui/FileCard.hpp

@@ -1,7 +1,7 @@
 #include <string>
 #include "../libs/chesto/src/Element.hpp"
 
-#ifdef _3DS_MOCK
+#if defined(_3DS) || defined(_3DS_MOCK)
 #define FILE_CARD_WIDTH 80
 #define LISTING_SCREEN_WIDTH (SCREEN_WIDTH - 80)
 #else

gui/MainDisplay.cpp

@@ -14,6 +14,8 @@ MainDisplay::MainDisplay()
 {
 	RootDisplay::super();
 	backgroundColor = fromRGB(0x42, 0x45, 0x48);
+
+	RootDisplay::idleCursorPulsing = true;
 }
 
 void MainDisplay::openFile(bool isFolder, std::string* path)

gui/TextQueryPopup.cpp

@@ -33,7 +33,7 @@ TextQueryPopup::TextQueryPopup(const char* prompt, const char* ctaText, std::fun
 	});
 	keyboard->preventEnterAndTab = true;
 
-#if defined(_3DS_MOCK)
+#if defined(_3DS) || defined(_3DS_MOCK)
 	keyboard->width = SCREEN_WIDTH - 140;
 	keyboard->position(40, 360);
 #endif

gui/Toolbar.cpp

@@ -32,12 +32,12 @@ bool Toolbar::commonHistoryLogic(bool isUndo, Editor* editor, TextInputElement*
 	bool isDelete = event.isDelete != isUndo;
 
 	int pos = event.pos;
-	std::string* chars = &event.chars;
+	std::string& chars = event.chars;
 
 	if (isDelete) {
-		editor->text->erase(pos, chars->length());
+		editor->text->erase(pos, chars.length());
 	} else {
-		editor->text->insert(pos, chars->c_str());
+		editor->text->insert(pos, chars.c_str());
 	}
 
 	// move cursor
@@ -217,7 +217,7 @@ void Toolbar::initButtons(EditorView* editorView)
 			editorView->keyboard->hidden = false;
 			editorView->keepCursorOnscreen = true;
 
-#if defined(_3DS_MOCK)
+#if defined(_3DS) || defined(_3DS_MOCK)
 			editorView->keyboard->width = SCREEN_WIDTH - 140;
 			editorView->keyboard->position(40, 360);
 			editorView->keyboard->updateSize();