options: Reduce repeated width calcs and cleanup code

Author: joel16

app/source/gui/options.cpp

@@ -6,48 +6,52 @@
 #include "g2d.h"
 #include "gui.h"
 #include "kernel_functions.h"
+#include "log.h"
 #include "textures.h"
 #include "utils.h"
 
 static int row = 0, column = 0;
-static bool copy = false, move = false, options_more = false;
+static bool copy = false, move = false, moreOptions = false;
 
 namespace Options {
     static void ResetSelector(void) {
         row = 0;
         column = 0;
     }
+    
+    static void RefreshDirectory(MenuItem &item) {
+        FS::GetDirList(cfg.cwd, item.entries);
+        GUI::ResetCheckbox(item);
+    }
 
     static void HandleMultipleCopy(MenuItem &item, int (*func)()) {
         int ret = 0;
         std::vector<SceIoDirent> entries;
 
-        if (R_FAILED(ret = FS::GetDirList(item.checked_cwd.data(), entries)))
+        if (R_FAILED(ret = FS::GetDirList(item.checked_cwd.data(), entries))) {
             return;
+        }
 
         for (u32 i = 0; i < item.checked_copy.size(); i++) {
-            if (item.checked_copy.at(i)) {
+            if (item.checked_copy[i]) {
                 FS::Copy(entries[i], item.checked_cwd);
+
                 if (R_FAILED((*func)())) {
-                    FS::GetDirList(cfg.cwd, item.entries);
-                    GUI::ResetCheckbox(item);
+                    Options::RefreshDirectory(item);
                     break;
                 }
             }
         }
 
-        FS::GetDirList(cfg.cwd, item.entries);
-        GUI::ResetCheckbox(item);
-        entries.clear();
+        Options::RefreshDirectory(item);
     }
 
     static void CreateFolder(MenuItem &item) {
         std::string name = G2D::KeyboardGetText("Enter folder name", "New folder");
         std::string path = FS::BuildPath(cfg.cwd, name);
 
         if (R_SUCCEEDED(FS::MakeDir(path.c_str()))) {
-            FS::GetDirList(cfg.cwd, item.entries);
-            GUI::ResetCheckbox(item);
+            Options::RefreshDirectory(item);
         }
     }
 
@@ -56,8 +60,7 @@ namespace Options {
         std::string path = FS::BuildPath(cfg.cwd, name);
 
         if (R_SUCCEEDED(FS::CreateFile(path.c_str()))) {
-            FS::GetDirList(cfg.cwd, item.entries);
-            GUI::ResetCheckbox(item);
+            Options::RefreshDirectory(item);
         }
     }
 
@@ -73,28 +76,33 @@ namespace Options {
 #endif
             FS::GetDirList(cfg.cwd, item.entries);
             Options::ResetSelector();
-            options_more = false;
+            moreOptions = 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))
+            if ((item.checked_count >= 1) && (item.checked_cwd.compare(cfg.cwd) != 0)) {
                 GUI::ResetCheckbox(item);
-            if (item.checked_count <= 1)
+            }
+            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))
+            Log::Error("In !copy\n");
+            if ((item.checked_count > 1) && (item.checked_cwd.compare(cfg.cwd) != 0)) {
+                Log::Error("In !copy IF\n");
                 Options::HandleMultipleCopy(item, &FS::Paste);
+            }
             else {
+                Log::Error("In !copy ELSE\n");
                 if (R_SUCCEEDED(FS::Paste())) {
-                    FS::GetDirList(cfg.cwd, item.entries);
-                    GUI::ResetCheckbox(item);
+                    Options::RefreshDirectory(item);
                 }
             }
 
@@ -106,18 +114,20 @@ namespace Options {
 
     static void Move(MenuItem &item) {
         if (!move) {
-            if ((item.checked_count >= 1) && (item.checked_cwd.compare(cfg.cwd) != 0))
+            if ((item.checked_count >= 1) && (item.checked_cwd.compare(cfg.cwd) != 0)) {
                 GUI::ResetCheckbox(item);
+            }
 
-            if (item.checked_count <= 1)
+            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))
+            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);
+                Options::RefreshDirectory(item);
             }
         }
 
@@ -128,34 +138,44 @@ namespace Options {
 
 namespace GUI {
     void DisplayFileOptions(MenuItem &item) {
+        int cancelWidth = intraFontMeasureText(font, "CANCEL");
+
         G2D::DrawRect(0, 18, 480, 254, G2D_RGBA(0, 0, 0, cfg.dark_theme? 50 : 80));
         G2D::DrawImage(options_dialog[cfg.dark_theme], (480 - options_dialog[0]->w) / 2, (272 - options_dialog[0]->h) / 2);
         G2D::FontSetStyle(1.f, TITLE_COLOUR, INTRAFONT_ALIGN_LEFT);
         G2D::DrawText(140, 52, "Actions");
 
-        if (row == 0 && column == 0)
+        if (row == 0 && column == 0) {
             G2D::DrawRect(132, 71, 107, 38, SELECTOR_COLOUR);
-        else if (row == 1 && column == 0)
+        }
+        else if (row == 1 && column == 0) {
             G2D::DrawRect(241, 71, 107, 38, SELECTOR_COLOUR);
-        else if (row == 0 && column == 1)
+        }
+        else if (row == 0 && column == 1) {
             G2D::DrawRect(132, 110, 107, 38, SELECTOR_COLOUR);
-        else if (row == 1 && column == 1)
+        }
+        else if (row == 1 && column == 1) {
             G2D::DrawRect(241, 110, 107, 38, SELECTOR_COLOUR);
-        else if (row == 0 && column == 2 && !options_more)
+        }
+        else if (row == 0 && column == 2 && !moreOptions) {
             G2D::DrawRect(132, 148, 107, 38, SELECTOR_COLOUR);
-        else if (row == 1 && column == 2 && !options_more)
+        }
+        else if (row == 1 && column == 2 && !moreOptions) {
             G2D::DrawRect(241, 148, 107, 38, SELECTOR_COLOUR);
-        else if (column == 3 && !options_more)
-            G2D::DrawRect((340 - intraFontMeasureText(font, "CANCEL")) - 5, (230 - (font->texYSize - 6)) - 5, intraFontMeasureText(font, "CANCEL") + 10,
+        }
+        else if (column == 3 && !moreOptions) {
+            G2D::DrawRect((340 - cancelWidth) - 5, (230 - (font->texYSize - 6)) - 5, cancelWidth + 10,
                 (font->texYSize - 6) + 10, SELECTOR_COLOUR);
-        else if (column == 2 && options_more)
-            G2D::DrawRect((340 - intraFontMeasureText(font, "CANCEL")) - 5, (230 - (font->texYSize - 6)) - 5, intraFontMeasureText(font, "CANCEL") + 10, 
+        }
+        else if (column == 2 && moreOptions) {
+            G2D::DrawRect((340 - cancelWidth) - 5, (230 - (font->texYSize - 6)) - 5, cancelWidth + 10, 
                 (font->texYSize - 6) + 10, SELECTOR_COLOUR);
+        }
 
-        G2D::DrawText(340 - intraFontMeasureText(font, "CANCEL"), 230 - (font->texYSize - 15), "CANCEL");
+        G2D::DrawText(340 - cancelWidth, 230 - (font->texYSize - 15), "CANCEL");
         G2D::FontSetStyle(1.f, TEXT_COLOUR, INTRAFONT_ALIGN_LEFT);
 
-        if (!options_more) {
+        if (!moreOptions) {
             G2D::DrawText(143, 95, "Properties");
             G2D::DrawText(143, 133, copy? "Paste" : "Copy");
             G2D::DrawText(143, 171, "Delete");
@@ -171,84 +191,97 @@ namespace GUI {
     }
 
     void ControlFileOptions(MenuItem &item, int &ctrl) {
-        if (ctrl & PSP_CTRL_RIGHT)
+        if (ctrl & PSP_CTRL_RIGHT) {
             row++;
-        else if (ctrl & PSP_CTRL_LEFT)
+        }
+        else if (ctrl & PSP_CTRL_LEFT) {
             row--;
+        }
 
-        if (ctrl & PSP_CTRL_DOWN)
+        if (ctrl & PSP_CTRL_DOWN) {
             column++;
-        else if (ctrl & PSP_CTRL_UP)
+        }
+        else if (ctrl & PSP_CTRL_UP) {
             column--;
+        }
 
-        if (!options_more) {
+        if (!moreOptions) {
             Utils::SetBounds(row, 0, 1);
             Utils::SetBounds(column, 0, 3);
         }
         else {
             Utils::SetBounds(column, 0, 2);
 
-            if (column == 1)
+            if (column == 1) {
                 Utils::SetBounds(row, 0, 0);
-            else
+            }
+            else {
                 Utils::SetBounds(row, 0, 1);
+            }
         }
 
         if (Utils::IsButtonPressed(PSP_CTRL_ENTER)) {
-            const std::string filename = item.entries[item.selected].d_name;
-
             if (row == 0) {
-                if (!options_more) {
-                    if (column == 0)
+                if (!moreOptions) {
+                    if (column == 0) {
                         item.state = MENU_STATE_PROPERTIES;
-                    else if (column == 1)
+                    }
+                    else if (column == 1) {
                         Options::Copy(item);
-                    else if (column == 2)
+                    }
+                    else if (column == 2) {
                         item.state = MENU_STATE_DELETE;
+                    }
                 }
                 else {
-                    if (column == 0)
+                    if (column == 0) {
                         Options::CreateFolder(item);
-                    else if (column == 1)
-                        Options::Rename(item, filename);
+                    }
+                    else if (column == 1) {
+                        Options::Rename(item, item.entries[item.selected].d_name);
+                    }
                 }
             }
             else if (row == 1) {
-                if (!options_more) {
+                if (!moreOptions) {
                     if (column == 0) {
                         FS::GetDirList(cfg.cwd, item.entries);
                         Options::ResetSelector();
-                        options_more = false;
+                        moreOptions = false;
                         item.selected = 0;
                         item.state = MENU_STATE_FILEBROWSER;
                     }
-                    else if (column == 1)
+                    else if (column == 1) {
                         Options::Move(item);
+                    }
                     else if (column == 2) {
                         Options::ResetSelector();
-                        options_more = true;
+                        moreOptions = true;
                     }
                 }
                 else {
-                    if (column == 0)
+                    if (column == 0) {
                         Options::CreateFile(item);
+                    }
                 }
             }
             if (column == 3) {
                 copy = false;
                 move = false;
                 Options::ResetSelector();
-                options_more = false;
+                moreOptions = false;
                 item.state = MENU_STATE_FILEBROWSER;
             }
         }
         if (Utils::IsButtonPressed(PSP_CTRL_CANCEL)) {
             Options::ResetSelector();
 
-            if (!options_more)
+            if (!moreOptions) {
                 item.state = MENU_STATE_FILEBROWSER;
-            else
-                options_more = false;
+            }
+            else {
+                moreOptions = false;
+            }
         }
     }
 }