Fix stubs and separator API

Author: Ibrahim778

CMakeLists.txt

@@ -69,8 +69,8 @@ VDSuiteSignElf(${PROJECT_NAME}.suprx ${PROJECT_NAME})
 
 VDSuiteCreateStubs(stubs ${PROJECT_NAME}.emd
   LIBRARIES
-    quickMenuReborn_stub
-    quickMenuReborn_stub_weak
+    QuickMenuReborn_stub
+    QuickMenuReborn_stub_weak
 )
 
 # Generate VitaSDK stubs
@@ -80,8 +80,8 @@ add_custom_command(TARGET QuickMenuReborn POST_BUILD
 
 add_custom_target(install_vdsuite
     COMMAND xcopy /E /I /H /Y ..\\src\\quickmenureborn\\ %SCE_PSP2_SDK_DIR%\\target\\include\\vdsuite\\user\\quickmenureborn\\
-    COMMAND xcopy /E /I /H /Y stubs\\libquickMenuReborn_stub.a %SCE_PSP2_SDK_DIR%\\target\\lib\\vdsuite\\
-    COMMAND xcopy /E /I /H /Y stubs\\libquickMenuReborn_stub_weak.a %SCE_PSP2_SDK_DIR%\\target\\lib\\vdsuite\\
+    COMMAND xcopy /E /I /H /Y stubs\\libQuickMenuReborn_stub.a %SCE_PSP2_SDK_DIR%\\target\\lib\\vdsuite\\
+    COMMAND xcopy /E /I /H /Y stubs\\libQuickMenuReborn_stub_weak.a %SCE_PSP2_SDK_DIR%\\target\\lib\\vdsuite\\
 )
 
 add_subdirectory(sample_plugin)

QuickMenuReborn.emd

@@ -3,23 +3,23 @@ sceModuleInfo_type: 6
 module_function: module_start localname: module_start
 module_function: module_stop localname: module_stop
 
-Library: quickMenuReborn version: 1
-Library: quickMenuReborn nidsuffix: ""
-Library: quickMenuReborn attr: auto_export
-Library: quickMenuReborn libnamenid: 0xCF1E4EF8
-Library: quickMenuReborn function: QuickMenuRebornAddWidget nidvalue: 0x11202C4E
-Library: quickMenuReborn function: QuickMenuRebornRemoveWidget nidvalue: 0x2A690516
-Library: quickMenuReborn function: QuickMenuRebornUpdateWidget nidvalue: 0x8A4F2291
-Library: quickMenuReborn function: makeWidgetColor nidvalue: 0xB68C617D
-Library: quickMenuReborn function: makeWidgetVector4 nidvalue: 0x5F2B7794
-Library: quickMenuReborn function: QuickMenuRebornButton nidvalue: 0x8DEFE60D
-Library: quickMenuReborn function: QuickMenuRebornCheckBox nidvalue: 0x93245A61
-Library: quickMenuReborn function: QuickMenuRebornText nidvalue: 0x36F4C81F
-Library: quickMenuReborn function: QuickMenuRebornPlane nidvalue: 0xEFD76FB6
-Library: quickMenuReborn function: QuickMenuRebornSeparator nidvalue: 0x554D28CD
-Library: quickMenuReborn function: QuickMenuRebornUpdateButton nidvalue: 0xF8E8F906
-Library: quickMenuReborn function: QuickMenuRebornUpdateCheckBox nidvalue: 0x1FAEA672
-Library: quickMenuReborn function: QuickMenuRebornUpdateText nidvalue: 0x68680E26
-Library: quickMenuReborn function: QuickMenuRebornUpdatePlane nidvalue: 0xFC8EA5DB
-Library: quickMenuReborn function: QuickMenuRebornRemoveSeparator nidvalue: 0x7550C9BF
-Library: quickMenuReborn function: QuickMenuRebornGetCheckBoxState nidvalue: 0x65214907
+Library: QuickMenuReborn version: 1
+Library: QuickMenuReborn nidsuffix: ""
+Library: QuickMenuReborn attr: auto_export
+Library: QuickMenuReborn libnamenid: 0x6642F554
+Library: QuickMenuReborn function: QuickMenuRebornAddWidget nidvalue: 0x11202C4E
+Library: QuickMenuReborn function: QuickMenuRebornRemoveWidget nidvalue: 0x2A690516
+Library: QuickMenuReborn function: QuickMenuRebornUpdateWidget nidvalue: 0x8A4F2291
+Library: QuickMenuReborn function: makeWidgetColor nidvalue: 0xB68C617D
+Library: QuickMenuReborn function: makeWidgetVector4 nidvalue: 0x5F2B7794
+Library: QuickMenuReborn function: QuickMenuRebornButton nidvalue: 0x8DEFE60D
+Library: QuickMenuReborn function: QuickMenuRebornCheckBox nidvalue: 0x93245A61
+Library: QuickMenuReborn function: QuickMenuRebornText nidvalue: 0x36F4C81F
+Library: QuickMenuReborn function: QuickMenuRebornPlane nidvalue: 0xEFD76FB6
+Library: QuickMenuReborn function: QuickMenuRebornSeparator nidvalue: 0x554D28CD
+Library: QuickMenuReborn function: QuickMenuRebornUpdateButton nidvalue: 0xF8E8F906
+Library: QuickMenuReborn function: QuickMenuRebornUpdateCheckBox nidvalue: 0x1FAEA672
+Library: QuickMenuReborn function: QuickMenuRebornUpdateText nidvalue: 0x68680E26
+Library: QuickMenuReborn function: QuickMenuRebornUpdatePlane nidvalue: 0xFC8EA5DB
+Library: QuickMenuReborn function: QuickMenuRebornRemoveSeparator nidvalue: 0x7550C9BF
+Library: QuickMenuReborn function: QuickMenuRebornGetCheckBoxState nidvalue: 0x65214907

QuickMenuReborn.yml

@@ -1,8 +1,8 @@
 modules:
   QuickMenuReborn:
     libraries:
-      quickMenuReborn:
-        nid: 0xCF1E4EF8
+      QuickMenuReborn:
+        nid: 0x6642F554
         functions:
           QuickMenuRebornAddWidget: 0x11202C4E
           QuickMenuRebornRemoveWidget: 0x2A690516

exporter.py

@@ -3,8 +3,8 @@
 EMD_PATH="QuickMenuReborn.emd"
 YML_PATH="QuickMenuReborn.yml"
 
-EMD_START="Module: QuickMenuReborn major_version: 3 minor_version: 0\nsceModuleInfo_type: 6\nmodule_function: module_start localname: module_start\nmodule_function: module_stop localname: module_stop\n\nLibrary: quickMenuReborn version: 1\nLibrary: quickMenuReborn nidsuffix: \"\"\nLibrary: quickMenuReborn attr: auto_export\n"
-LIB_NAME="quickMenuReborn"
+EMD_START="Module: QuickMenuReborn major_version: 3 minor_version: 0\nsceModuleInfo_type: 6\nmodule_function: module_start localname: module_start\nmodule_function: module_stop localname: module_stop\n\nLibrary: QuickMenuReborn version: 1\nLibrary: QuickMenuReborn nidsuffix: \"\"\nLibrary: QuickMenuReborn attr: auto_export\n"
+LIB_NAME="QuickMenuReborn"
 functionNames=[ 
         "QuickMenuRebornAddWidget",
         "QuickMenuRebornRemoveWidget",

sample_plugin/CMakeLists.txt

@@ -30,7 +30,7 @@ add_library(samples MODULE
 
 target_link_libraries(samples
   SceKernel_stub
-  quickMenuReborn_stub_weak
+  QuickMenuReborn_stub_weak
 )
 
 VDSuiteSignElf(QuickMenuRebornSample.suprx samples)

src/user/export_handler.cpp

@@ -45,8 +45,10 @@ widgetColor makeWidgetColor(float r, float g, float b, float a)
 int QuickMenuRebornRemoveSeparator(const char *refID)
 {
     char id[0x100];
-    sce_paf_snprintf(id, sizeof(id), "qm_reborn_%s_separator", refID);
+    sce_paf_snprintf(id, sizeof(id), "qm_reborn_%s_separator_0", refID);
+    unregisterWidget(id);
 
+    sce_paf_snprintf(id, sizeof(id), "qm_reborn_%s_separator_1", refID);
     return unregisterWidget(id);
 }
 
@@ -159,10 +161,19 @@ int QuickMenuRebornPlane(const char *refID, const char *parentRefID, vector4 *Si
 int QuickMenuRebornSeparator(const char *refID)
 {
     char sepID[256] = {0};
-    sce_paf_snprintf(sepID, sizeof(sepID), "qm_reborn_%s_separator", refID);
+    sce_paf_snprintf(sepID, sizeof(sepID), "qm_reborn_%s_separator_0", refID);
+    
+    //Invisible Spacer
+    vector4 size = makeWidgetVector4Int(825, 20, 0, 0), pos = makeCommonWidgetVector4Int(0);
+    widgetColor col = COLOR_TRANSPARENT;
+    
+    QuickMenuRebornPlane(sepID, NULL, &size, &pos, &col, NULL);
 
-    vector4 size = makeWidgetVector4(825.0f,2.0f,0.0f,0.0f), pos = makeWidgetVector4(0,0,0,0);
-    widgetColor col = makeWidgetColor(.75f,.75f,.75f,.75f);
+    //Line
+    sce_paf_snprintf(sepID, sizeof(sepID), "qm_reborn_%s_separator_1", refID);
+    size = makeWidgetVector4(825.0f,2.0f,0.0f,0.0f);
+    pos = makeWidgetVector4(0,0,0,0);
+    col = makeWidgetColor(.75f,.75f,.75f,.75f);
     QuickMenuRebornPlane(sepID, NULL, &size, &pos, &col, NULL);
 
     return 0;

src/user/main.cpp

@@ -22,30 +22,6 @@ SceVoid leakTestTask(void)
 }
 #endif
 
-//Add an invisible spacer after accesability widgets, just to make things look a bit cleaner
-int addInitialSpacer()
-{
-    widgetData widget;
-    sce_paf_memset(&widget, 0, sizeof(widget));
-
-    widget.type = plane;
-
-    //Need to set everything manually
-    widget.col.r = 1.0f;
-    widget.col.g = 1.0f;
-    widget.col.b = 1.0f;
-    widget.col.a = 0.0f;
-
-    widget.size.x = 825.0f;
-    widget.size.y = 20.0f;
-    widget.size.z = 0.0f;
-    widget.size.w = 0.0f;
-    
-    sce_paf_memcpy(widget.refId, INTERNAL_SPACER_ID, sizeof(widget.refId));
-
-    return registerWidget(&widget);
-}
-
 SceInt32 VblankCallback(SceUID notifyId, SceInt32 notifyCount, SceInt32 notifyArg, void* pCommon) 
 {
     SceAppMgrAppState state;
@@ -80,8 +56,6 @@ int impose_thread(SceSize, void *)
     //Delay to let shell load properly
     sceKernelDelayThread(4 * 1000 * 1000);
 
-    addInitialSpacer();
-
     SceUID CallbackUID = sceKernelCreateCallback("QMR_VblankCB", 0, VblankCallback, NULL);
     if (CallbackUID < 0)
         sceKernelExitThread(CallbackUID);