joel16/3DShell
1
0
Fork 0
mirror of https://github.com/joel16/3DShell.git synced 2024-11-26 21:10:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

touch: Enable touch controls for file options

Browse Source
This commit is contained in:
Joel16 2021-03-22 12:00:16 -04:00
parent bcdfb17973
commit 75e3f9f98d
4 changed files with 242 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
source/gui/delete.cpp
View File

@ -8,8 +8,41 @@
#include "gui.h"
#include "log.h"
#include "textures.h"
#include "touch.h"
#include "utils.h"
namespace Options {
void Delete(MenuItem *item, int *selection) {
Result ret = 0;
Log::Close();
if ((item->checked_count > 1) && (!item->checked_cwd.compare(cfg.cwd))) {
for (u32 i = 0; i < item->checked.size(); i++) {
if (item->checked.at(i)) {
if (R_FAILED(ret = FS::Delete(&item->entries[i]))) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
break;
}
}
}
}
else
ret = FS::Delete(&item->entries[item->selected]);
if (R_SUCCEEDED(ret)) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
}
GUI::RecalcStorageSize(item);
Log::Open();
*selection = 0;
item->selected = 0;
item->state = MENU_STATE_FILEBROWSER;
}
}
namespace GUI {
static int selection = 0;
static const std::string prompt = "Do you wish to continue?";
@ -41,35 +74,8 @@ namespace GUI {
selection--;
if (*kDown & KEY_A) {
if (selection == 1) {
Result ret = 0;
Log::Close();
if ((item->checked_count > 1) && (!item->checked_cwd.compare(cfg.cwd))) {
for (u32 i = 0; i < item->checked.size(); i++) {
if (item->checked.at(i)) {
if (R_FAILED(ret = FS::Delete(&item->entries[i]))) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
break;
}
}
}
}
else
ret = FS::Delete(&item->entries[item->selected]);
if (R_SUCCEEDED(ret)) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
}
GUI::RecalcStorageSize(item);
Log::Open();
selection = 0;
item->selected = 0;
item->state = MENU_STATE_FILEBROWSER;
}
if (selection == 1)
Options::Delete(item, &selection);
else
item->state = MENU_STATE_OPTIONS;
@ -77,6 +83,21 @@ namespace GUI {
else if (*kDown & KEY_B)
item->state = MENU_STATE_OPTIONS;
if (Touch::Rect((288 - cancel_width) - 5, (159 - cancel_height) - 5, ((288 - cancel_width) - 5) + cancel_width + 10, ((159 - cancel_height) - 5) + cancel_height + 10)) {
selection = 0;
if (*kDown & KEY_TOUCH) {
item->state = MENU_STATE_OPTIONS;
selection = 0;
}
}
else if (Touch::Rect((248 - (confirm_width)) - 5, (159 - confirm_height) - 5, ((248 - (confirm_width)) - 5) + confirm_width + 10, ((159 - confirm_height) - 5) + confirm_height + 10)) {
selection = 1;
if (*kDown & KEY_TOUCH)
Options::Delete(item, &selection);
}
Utils::SetBounds(&selection, 0, 1);
}
}

2
source/gui/gui.cpp
View File

@ -208,6 +208,7 @@ namespace GUI {
C2D::Render();
hidScanInput();
Touch::Update();
u32 kDown = hidKeysDown();
u32 kHeld = hidKeysHeld();
@ -240,7 +241,6 @@ namespace GUI {
break;
}
Touch::Update();
GUI::ControlTouchButtons(&item, &kDown);
if ((kDown & KEY_START) || (setjmp(exit_jmp)))

271
source/gui/options.cpp
View File

@ -8,13 +8,13 @@
#include "gui.h"
#include "osk.h"
#include "textures.h"
#include "touch.h"
#include "utils.h"
namespace GUI {
static int row = 0, column = 0;
static float cancel_width = 0.f, cancel_height = 0.f;
static bool copy = false, move = false, options_more = false;
static int row = 0, column = 0;
static bool copy = false, move = false, options_more = false;
namespace Options {
static void ResetSelector(void) {
row = 0;
column = 0;
@ -43,6 +43,92 @@ namespace GUI {
entries.clear();
}
static void CreateFolder(MenuItem *item) {
std::string path = cfg.cwd;
std::string name = OSK::GetText("New Folder", "Enter folder name");
path.append(name);
std::u16string path_u16 = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.from_bytes(path.data());
if (R_SUCCEEDED(FSUSER_CreateDirectory(archive, fsMakePath(PATH_UTF16, path_u16.c_str()), 0))) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
}
}
static void CreateFile(MenuItem *item) {
std::string path = cfg.cwd;
std::string name = OSK::GetText("New File", "Enter file name");
path.append(name);
std::u16string path_u16 = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.from_bytes(path.data());
if (R_SUCCEEDED(FSUSER_CreateFile(archive, fsMakePath(PATH_UTF16, path_u16.c_str()), 0, 0))) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
}
}
static void Rename(MenuItem *item, const std::string &filename) {
std::string path = OSK::GetText(filename, "Enter new name");
if (R_SUCCEEDED(FS::Rename(&item->entries[item->selected], path.c_str()))) {
FS::GetDirList(cfg.cwd, item->entries);
Options::ResetSelector();
options_more = false;
item->state = MENU_STATE_FILEBROWSER;
}
}
static void Copy(MenuItem *item) {
if (!copy) {
if ((item->checked_count >= 1) && (item->checked_cwd.compare(cfg.cwd) != 0))
GUI::ResetCheckbox(item);
if (item->checked_count <= 1)
FS::Copy(&item->entries[item->selected], cfg.cwd);
copy = !copy;
item->state = MENU_STATE_FILEBROWSER;
}
else {
if ((item->checked_count > 1) && (item->checked_cwd.compare(cfg.cwd) != 0))
Options::HandleMultipleCopy(item, &FS::Paste);
else {
if (R_SUCCEEDED(FS::Paste())) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
}
}
GUI::RecalcStorageSize(item);
copy = !copy;
item->state = MENU_STATE_FILEBROWSER;
}
}
static void Move(MenuItem *item) {
if (!move) {
if ((item->checked_count >= 1) && (item->checked_cwd.compare(cfg.cwd) != 0))
GUI::ResetCheckbox(item);
if (item->checked_count <= 1)
FS::Copy(&item->entries[item->selected], cfg.cwd);
}
else {
if ((item->checked_count > 1) && (item->checked_cwd.compare(cfg.cwd) != 0))
Options::HandleMultipleCopy(item, &FS::Move);
else if (R_SUCCEEDED(FS::Move())) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
}
}
move = !move;
item->state = MENU_STATE_FILEBROWSER;
}
}
namespace GUI {
static float cancel_width = 0.f, cancel_height = 0.f;
void DisplayFileOptions(MenuItem *item) {
C2D::Image(cfg.dark_theme? options_dialog_dark : options_dialog, 54, 30);
C2D::Text(61, 34, 0.42f, cfg.dark_theme? TITLE_COLOUR_DARK : TITLE_COLOUR, "Actions");
@ -115,121 +201,134 @@ namespace GUI {
if (!options_more) {
if (column == 0)
item->state = MENU_STATE_PROPERTIES;
else if (column == 1) {
// Copy
if (!copy) {
if ((item->checked_count >= 1) && (item->checked_cwd.compare(cfg.cwd) != 0))
GUI::ResetCheckbox(item);
if (item->checked_count <= 1)
FS::Copy(&item->entries[item->selected], cfg.cwd);
copy = !copy;
item->state = MENU_STATE_FILEBROWSER;
}
else {
if ((item->checked_count > 1) && (item->checked_cwd.compare(cfg.cwd) != 0))
GUI::HandleMultipleCopy(item, &FS::Paste);
else {
if (R_SUCCEEDED(FS::Paste())) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
}
}
GUI::RecalcStorageSize(item);
copy = !copy;
item->state = MENU_STATE_FILEBROWSER;
}
}
else if (column == 1)
Options::Copy(item);
else if (column == 2)
item->state = MENU_STATE_DELETE;
}
else {
if (column == 0) {
std::string path = cfg.cwd;
std::string name = OSK::GetText("New Folder", "Enter folder name");
path.append(name);
std::u16string path_u16 = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.from_bytes(path.data());
if (R_SUCCEEDED(FSUSER_CreateDirectory(archive, fsMakePath(PATH_UTF16, path_u16.c_str()), 0))) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
}
}
else if (column == 1) {
std::string path = OSK::GetText(filename, "Enter new name");
if (R_SUCCEEDED(FS::Rename(&item->entries[item->selected], path.c_str()))) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetSelector();
options_more = false;
item->state = MENU_STATE_FILEBROWSER;
}
}
if (column == 0)
Options::CreateFolder(item);
else if (column == 1)
Options::Rename(item, filename);
}
}
else if (row == 1) {
if (!options_more) {
if (column == 0) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetSelector();
Options::ResetSelector();
options_more = false;
item->selected = 0;
item->state = MENU_STATE_FILEBROWSER;
}
else if (column == 1) {
if (!move) {
if ((item->checked_count >= 1) && (item->checked_cwd.compare(cfg.cwd) != 0))
GUI::ResetCheckbox(item);
if (item->checked_count <= 1)
FS::Copy(&item->entries[item->selected], cfg.cwd);
}
else {
if ((item->checked_count > 1) && (item->checked_cwd.compare(cfg.cwd) != 0))
GUI::HandleMultipleCopy(item, &FS::Move);
else if (R_SUCCEEDED(FS::Move())) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
}
}
move = !move;
item->state = MENU_STATE_FILEBROWSER;
}
else if (column == 1)
Options::Move(item);
else if (column == 2) {
GUI::ResetSelector();
Options::ResetSelector();
options_more = true;
}
}
else {
if (column == 0) {
std::string path = cfg.cwd;
std::string name = OSK::GetText("New File", "Enter file name");
path.append(name);
std::u16string path_u16 = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.from_bytes(path.data());
if (R_SUCCEEDED(FSUSER_CreateFile(archive, fsMakePath(PATH_UTF16, path_u16.c_str()), 0, 0))) {
FS::GetDirList(cfg.cwd, item->entries);
GUI::ResetCheckbox(item);
}
}
if (column == 0)
Options::CreateFile(item);
}
}
if (column == 3) {
options_more = false;
copy = false;
move = false;
row = 0;
column = 0;
Options::ResetSelector();
options_more = false;
item->state = MENU_STATE_FILEBROWSER;
}
}
if (*kDown & KEY_B) {
GUI::ResetSelector();
Options::ResetSelector();
if (!options_more)
item->state = MENU_STATE_FILEBROWSER;
else
options_more = false;
}
if (Touch::Rect(56, 69, 159, 104)) {
row = 0;
column = 0;
if (*kDown & KEY_TOUCH) {
if (!options_more)
item->state = MENU_STATE_PROPERTIES;
else
Options::CreateFolder(item);
}
}
else if (Touch::Rect(160, 69, 263, 104)) {
row = 1;
column = 0;
if (*kDown & KEY_TOUCH) {
if (!options_more) {
FS::GetDirList(cfg.cwd, item->entries);
Options::ResetSelector();
options_more = false;
item->selected = 0;
item->state = MENU_STATE_FILEBROWSER;
}
else
Options::CreateFile(item);
}
}
else if (Touch::Rect(56, 105, 159, 141)) {
row = 0;
column = 1;
if (*kDown & KEY_TOUCH) {
if (!options_more)
Options::Copy(item);
else {
const std::u16string entry_name_utf16 = reinterpret_cast<const char16_t *>(item->entries[item->selected].name);
const std::string filename = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.to_bytes(entry_name_utf16.data());
Options::Rename(item, filename);
}
}
}
else if ((Touch::Rect(160, 105, 263, 141)) && (!options_more)) {
row = 1;
column = 1;
if (*kDown & KEY_TOUCH)
Options::Move(item);
}
else if ((Touch::Rect(56, 142, 159, 178)) && (!options_more)) {
row = 0;
column = 2;
if (*kDown & KEY_TOUCH)
item->state = MENU_STATE_DELETE;
}
else if ((Touch::Rect(160, 142, 263, 178)) && (!options_more)) {
row = 1;
column = 2;
if (*kDown & KEY_TOUCH) {
Options::ResetSelector();
options_more = true;
}
}
else if (Touch::Rect((256 - cancel_width) - 5, (221 - cancel_height) - 5, ((256 - cancel_width) - 5) + cancel_width + 10,
((221 - cancel_height) - 5) + cancel_height + 10)) {
if (options_more)
column = 2;
else
column = 3;
if (*kDown & KEY_TOUCH) {
Options::ResetSelector();
options_more = false;
copy = false;
move = false;
item->state = MENU_STATE_FILEBROWSER;
}
}
}
}

6
source/gui/properties.cpp
View File

@ -5,6 +5,7 @@
#include "gui.h"
#include "log.h"
#include "textures.h"
#include "touch.h"
#include "utils.h"
namespace GUI {
@ -33,5 +34,10 @@ namespace GUI {
item->state = MENU_STATE_OPTIONS;
else if (*kDown & KEY_B)
item->state = MENU_STATE_OPTIONS;
if (Touch::Rect((253 - ok_width) - 5, (218 - ok_height) - 5, ((253 - ok_width) - 5) + ok_width + 10, ((218 - ok_height) - 5) + ok_height + 10)) {
if (*kDown & KEY_TOUCH)
item->state = MENU_STATE_OPTIONS;
}
}
}