Release Candidate v0.10.1

.github/workflows/CD.yml

@@ -50,6 +50,7 @@ jobs:
             libpsl-dev \
             libidn2-dev \
             libnghttp2-dev \
+            libnotify-dev \
             libunistring-dev \
             libnotify-dev \
             libqt5svg5-dev \

CMakeLists.txt

@@ -9,8 +9,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 # Static linking to avoid runtime dependencies (vcruntime)
-if(WIN32 AND MSVC) 
-  set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") 
+if(WIN32 AND MSVC)
+  set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 endif()
 
 # Strip debug symbols in release
@@ -38,13 +38,13 @@ include(FetchContent)
 
 FetchContent_Declare(imgui
     GIT_REPOSITORY https://github.com/ocornut/imgui
-    GIT_TAG        v1.92.5-docking
+    GIT_TAG        v1.92.8-docking
     GIT_SHALLOW    TRUE
 )
 
 FetchContent_Declare(glaze
     GIT_REPOSITORY https://github.com/stephenberry/glaze.git
-    GIT_TAG        v5.5.4
+    GIT_TAG        v7.7.0
     GIT_SHALLOW    TRUE
 )
 
@@ -53,15 +53,21 @@ FetchContent_Declare(stb
     DOWNLOAD_NO_EXTRACT  TRUE
 )
 
+FetchContent_Declare(tray
+    GIT_REPOSITORY  https://github.com/LizardByte/tray.git
+    GIT_TAG         df9af119085e2cd3f1a9e88e4cc865963879d468
+    GIT_SHALLOW     TRUE
+)
+
 FetchContent_Declare(lunasvg
     GIT_REPOSITORY https://github.com/sammycage/lunasvg.git
     GIT_TAG        v3.5.0
 )
 
 FetchContent_Declare(tomlplusplus
     GIT_REPOSITORY https://github.com/marzer/tomlplusplus.git
-    GIT_TAG        7807a314ad1c0c9c227d9dbd68f23f187163372e
-    GIT_SHALLOW    TRUE
+    GIT_TAG        a43ad3787293f4a46b1d70c0924b5a25d10e79fc
+    GIT_SHALLOW    FALSE
 )
 
 FetchContent_Declare(cpr
@@ -76,8 +82,9 @@ FetchContent_Declare(battery-embed
 )
 
 FetchContent_MakeAvailable(
-  imgui glaze stb lunasvg tomlplusplus cpr battery-embed
+  imgui glaze stb tray lunasvg tomlplusplus cpr battery-embed
 )
+find_package(Freetype REQUIRED)
 
 #-----------------------------------------------------------------------------------------------------------------------
 # Target Definition
@@ -95,6 +102,7 @@ add_executable(${EXECUTABLE_NAME}
     ${imgui_SOURCE_DIR}/imgui_draw.cpp
     ${imgui_SOURCE_DIR}/imgui_tables.cpp
     ${imgui_SOURCE_DIR}/imgui_widgets.cpp
+    ${imgui_SOURCE_DIR}/misc/freetype/imgui_freetype.cpp
     ${imgui_SOURCE_DIR}/backends/imgui_impl_glfw.cpp
     ${imgui_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp
 )
@@ -148,6 +156,7 @@ target_include_directories(${EXECUTABLE_NAME} PRIVATE
     ${PROJECT_SOURCE_DIR}/include
     ${imgui_SOURCE_DIR}/
     ${stb_SOURCE_DIR}/
+    ${tray_SOURCE_DIR}/src
     ${tomlplusplus_SOURCE_DIR}/include
 )
 
@@ -157,7 +166,9 @@ target_link_libraries(${EXECUTABLE_NAME} PRIVATE
     glaze::glaze
     cpr::cpr
     lunasvg
+    tray::tray
     tinyfiledialogs
+    Freetype::Freetype
     $<$<PLATFORM_ID:Linux>:X11>
     $<$<PLATFORM_ID:Windows>:dwmapi>
     $<$<AND:$<CXX_COMPILER_ID:GNU>,$<PLATFORM_ID:Windows>>:opengl32.a>

include/application.h

@@ -20,6 +20,38 @@ struct RunnerState {
 struct WindowCallbacks {
   static void mouseButtonCB(GLFWwindow* window, int button, int action,
                             int mods);
+#ifdef _WIN32
+  static GLFWcursor* cursor_nwse;
+  static GLFWcursor* cursor_nesw;
+  static GLFWcursor* cursor_h;
+  static GLFWcursor* cursor_v;
+  static bool hovered_;
+
+  static int GetResizeZone(double xpos, double ypos, int w, int h,
+                           int threshold) {
+    bool l = xpos <= threshold;
+    bool r = xpos >= w - threshold;
+    bool t = ypos <= threshold;
+    bool b = ypos >= h - threshold;
+
+    if (t && l) return 1;  // Top-Left
+    if (t && r) return 2;  // Top-Right
+    if (b && l) return 3;  // Bottom-Left
+    if (b && r) return 4;  // Bottom-Right
+    if (l) return 5;       // Left
+    if (r) return 6;       // Right
+    if (t) return 7;       // Top
+    if (b) return 8;       // Bottom
+    return 0;              // None
+  }
+  static void cursorPosCB(GLFWwindow* window, double xpos, double ypos);
+  static void initCursors() {
+    cursor_nwse = glfwCreateStandardCursor(GLFW_RESIZE_NWSE_CURSOR);
+    cursor_nesw = glfwCreateStandardCursor(GLFW_RESIZE_NESW_CURSOR);
+    cursor_h = glfwCreateStandardCursor(GLFW_RESIZE_EW_CURSOR);
+    cursor_v = glfwCreateStandardCursor(GLFW_RESIZE_NS_CURSOR);
+  }
+#endif
 };
 
 void IdleBySleeping(FpsIdling& ioIdling);

include/ui/panel.h

@@ -27,18 +27,21 @@ class Panel {
 
   void setOnRefresh(std::function<void(const bool)> cb) { onRefresh_ = cb; }
 
-  static ImVec2 getScale() {
+  ImVec2 getScale() {
     ImGuiIO& io = ImGui::GetIO();
+    GLFWmonitor* monitor = glfwGetPrimaryMonitor();
+    glfwGetMonitorContentScale(monitor, &xs_, &ys_);
     if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) {
       return ImVec2(SCALE_FACTOR, SCALE_FACTOR);
     }
-    return ImVec2(io.DisplayFramebufferScale.x * SCALE_FACTOR,
-                  io.DisplayFramebufferScale.y * SCALE_FACTOR);
+    return ImVec2(io.DisplayFramebufferScale.x * SCALE_FACTOR * xs_,
+                  io.DisplayFramebufferScale.y * SCALE_FACTOR * ys_);
   }
 
  protected:
   std::string name_;
   Storage* storage_;
+  float xs_, ys_;
   bool visible_ = true;
   ImVec2 scale_ = ImVec2(0, 0);
 

include/ui/panels/left_panel.h

@@ -11,9 +11,19 @@ class LeftPanel : public Panel {
   void init() override;
   void render() override;
   void end() override {}
+  ImVec2 getScale() {
+    ImGuiIO& io = ImGui::GetIO();
+    if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) {
+      return ImVec2(SCALE_FACTOR, SCALE_FACTOR);
+    }
+    return ImVec2(io.DisplayFramebufferScale.x * SCALE_FACTOR * xs_,
+                  io.DisplayFramebufferScale.y * SCALE_FACTOR * ys_);
+  }
+  float getWidth() { return size_.x; }
 
  private:
   Views* view_ = nullptr;
+  ImVec2 size_;
 };
 
 }  // namespace ui

include/ui/panels/settings.h

@@ -1,55 +1,59 @@
-#pragma once
-#include <imgui.h>
-
-#include "ui/panel.h"
-#include "ui/panels/titlebar.h"
-
-namespace ui {
-enum class SettingsView {
-  LauncherConfig,
-  AccountSettings,
-};
-
-enum class InputType {
-  Toggle,
-  ColorPicker,
-  ImagePicker,
-  IntTextbox,
-  StringTextbox,
-};
-
-class SettingsPanel : public Panel {
- public:
-  SettingsPanel(Storage* storage, Titlebar* titlebar)
-      : Panel("Settings", storage), titlebar_(titlebar) {}
-
-  void init() override;
-  void render() override;
-  void end() override {};
-
- private:
-  bool quitTrayMin_ = false;
-  bool autoStart_ = false;
-  bool checkUpdates_ = true;
-  bool launcherIcons_ = true;
-  bool customTitlebar_ = true;
-  bool discordRpc_ = false;
-
-  Titlebar* titlebar_;
-
-  void loadSettings();
-  void saveSettings();
-
-  bool addMenuButton(const std::string& label, ImVec2 size, bool active);
-  void addIcon(const std::string& icon);
-  void addSection(const std::string& title, const std::string& icon);
-  bool addOption(const std::string& label, InputType input, bool* value,
-                 bool disabled = false);
-  bool ToggleButton(const char* label, bool* v, bool disabled);
-  bool ColorBox(const char* id, float color[3], ImVec2 size);
-  bool FilePickerButton(const char* label, const ImVec2& size);
-  bool NumberBox(const char* id, float* value, float width);
-  SettingsView view_ = SettingsView::LauncherConfig;
-};
-
-}  // namespace ui
+#pragma once
+#include <imgui.h>
+
+#include "ui/panel.h"
+#include "ui/panels/titlebar.h"
+
+namespace ui {
+enum class SettingsView {
+  LauncherConfig,
+  AccountSettings,
+};
+
+enum class InputType {
+  Toggle,
+  ColorPicker,
+  ImagePicker,
+  IntTextbox,
+  StringTextbox,
+};
+
+class SettingsPanel : public Panel {
+ public:
+  SettingsPanel(Storage* storage, Titlebar* titlebar, GLFWwindow* win)
+      : Panel("Settings", storage), titlebar_(titlebar), window_(win) {}
+
+  void init() override;
+  void render() override;
+  void end() override {};
+
+ private:
+  bool quitTrayMin_ = false;
+  bool autoStart_ = false;
+  bool checkUpdates_ = true;
+  bool launcherIcons_ = true;
+  bool customTitlebar_ = true;
+  bool discordRpc_ = false;
+  bool isEditing_ = false;
+
+  Titlebar* titlebar_;
+  GLFWwindow* window_;
+
+  void loadSettings();
+  void saveSettings();
+
+  bool addMenuButton(const std::string& label, ImVec2 size, bool active);
+  void addIcon(const std::string& icon);
+  void addSection(const std::string& title, const std::string& icon);
+  bool addOption(const std::string& label, InputType input, bool* value,
+                 bool disabled = false);
+  bool ToggleButton(const char* label, bool* v, bool disabled);
+  bool ColorBox(const char* id, float color[3], ImVec2 size);
+  bool FilePickerButton(const char* label, const ImVec2& size);
+  bool NumberBox(const char* id, float* value, float width);
+  SettingsView view_ = SettingsView::LauncherConfig;
+};
+
+}  // namespace ui
+
+std::string rgbToHex(int r, int g, int b);

include/ui/panels/titlebar.h

@@ -17,12 +17,22 @@ class Titlebar : public Panel {
 
   void setTitle(const std::string& text) { title_ = text; }
   void setCustomTitlebar(bool enabled) { customTitlebar_ = enabled; }
+  ImVec2 getScale() {
+    ImGuiIO& io = ImGui::GetIO();
+    if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) {
+      return ImVec2(SCALE_FACTOR, SCALE_FACTOR);
+    }
+    return ImVec2(io.DisplayFramebufferScale.x * SCALE_FACTOR * xs_,
+                  io.DisplayFramebufferScale.y * SCALE_FACTOR * ys_);
+  }
+  float getHeight() { return size_.y; }
 
  private:
   bool customTitlebar_ = true;
 
   std::string title_ = "Home";
   GLFWwindow* window;
+  ImVec2 size_;
 };
 
 }  // namespace ui

include/ui/theme.h

@@ -7,6 +7,7 @@ namespace Themes {
 
 inline uint32_t ACCENT_COLOR = 0x7E4CEA;
 inline ImU32 ACCENT_COLOR_IMGUI = IM_COL32(0x7E, 0x4C, 0xEA, 255);
+inline float BG_OPACITY = 0.8;
 
 void setDefaultDarkColors();
 

include/utils/autostart.h

@@ -0,0 +1,20 @@
+#ifdef _WIN32
+#include <shlwapi.h>
+#endif
+
+#include <string>
+
+namespace Autostart {
+#ifdef _WIN32
+std::wstring getExecutablePath();
+HRESULT createShortcut();
+#endif
+
+#ifdef __linux__
+std::string getExecutablePath();
+bool createShortcut();
+#endif
+
+bool deleteShortcut();
+bool shortcutExists();
+}  // namespace Autostart

include/utils/font_manager.h

@@ -11,7 +11,8 @@ class FontManager {
   static void init();
   static void shutdown();
   static ImFont* loadFont(const std::string& name,
-                          b::EmbedInternal::EmbeddedFile embed, float size);
+                          b::EmbedInternal::EmbeddedFile embed,
+                          float size = 16.0f);
   static ImFont* getFont(const std::string& name);
 
  private:

include/utils/image_manager.h

@@ -22,6 +22,7 @@ class ImageManager {
   static GLuint loadSVG(b::EmbedInternal::EmbeddedFile embed,
                         const std::string& id, uint32_t color);
   static GLuint get(const std::string& name);
+  static void remove(const std::string& name);
   static void clear();
 
  private:

include/utils/tray_manager.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include "GLFW/glfw3.h"
+
+namespace TrayManager {
+void init(GLFWwindow* window);
+void update();
+void minimize();
+bool shouldQuit();
+bool isWindowHidden();
+void shutdown();
+}  // namespace TrayManager