mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-07-12 18:19:42 -07:00
Update commander to ROCKNIX modern fork (dark-theme + paths + build-fix baked in)
The ROCKNIX fork includes all 3 patches we maintained separately: - 000-dark-theme.patch - 001-default-paths.patch - 002-build-fix.patch Switching to the fork removes the maintenance burden of patch rebasing. Adapted from ROCKNIX dd10d27a84 to projects/ArchR/ path.
This commit is contained in:
@@ -2,23 +2,15 @@
|
|||||||
# Copyright (C) 2025-present ArchR (https://github.com/archr-linux/Arch-R)
|
# Copyright (C) 2025-present ArchR (https://github.com/archr-linux/Arch-R)
|
||||||
|
|
||||||
PKG_NAME="commander"
|
PKG_NAME="commander"
|
||||||
PKG_VERSION="a6ef30eb3bd6ef80a031744aae0f5b9cd974c182"
|
PKG_VERSION="b3c008cac3bff9de54a3542cecc53cc271058744"
|
||||||
PKG_LICENSE="MIT"
|
PKG_LICENSE="MIT"
|
||||||
PKG_SITE="https://github.com/od-contrib/commander"
|
PKG_SITE="https://github.com/ROCKNIX/commander"
|
||||||
PKG_URL="${PKG_SITE}.git"
|
PKG_URL="${PKG_SITE}.git"
|
||||||
PKG_DEPENDS_TARGET="toolchain SDL2 SDL2_image SDL2_gfx SDL2_ttf dejavu"
|
PKG_DEPENDS_TARGET="toolchain SDL2 SDL2_image SDL2_gfx SDL2_ttf dejavu"
|
||||||
PKG_LONGDESC="A minimal SDL2 file manager for embedded Linux devices."
|
PKG_LONGDESC="A minimal SDL2 file manager for embedded Linux devices."
|
||||||
PKG_TOOLCHAIN="cmake"
|
PKG_TOOLCHAIN="cmake"
|
||||||
|
|
||||||
PKG_CMAKE_OPTS_TARGET+=" -DCMAKE_BUILD_TYPE=Release \
|
PKG_CMAKE_OPTS_TARGET+=" -DCMAKE_BUILD_TYPE=Release"
|
||||||
-DWITH_SYSTEM_SDL_TTF=ON \
|
|
||||||
-DWITH_SYSTEM_SDL_GFX=ON \
|
|
||||||
-DAUTOSCALE=0 \
|
|
||||||
-DAUTOSCALE_DPI=0 \
|
|
||||||
-DPPU_X=2 \
|
|
||||||
-DPPU_Y=2 \
|
|
||||||
-DCMDR_GAMEPAD_OPEN=ControllerButton::A \
|
|
||||||
-DCMDR_GAMEPAD_PARENT=ControllerButton::B"
|
|
||||||
|
|
||||||
makeinstall_target() {
|
makeinstall_target() {
|
||||||
mkdir -p ${INSTALL}/usr/bin
|
mkdir -p ${INSTALL}/usr/bin
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
diff --git a/def.h b/def.h
|
|
||||||
index 231e052..05de582 100755
|
|
||||||
--- a/def.h
|
|
||||||
+++ b/def.h
|
|
||||||
@@ -36,17 +36,17 @@
|
|
||||||
#define DIALOG_BORDER 2
|
|
||||||
#define DIALOG_PADDING 8
|
|
||||||
// Colors
|
|
||||||
-#define COLOR_TITLE_BG 102, 85, 74
|
|
||||||
-#define COLOR_KEY 255, 0, 255
|
|
||||||
-#define COLOR_TEXT_NORMAL 70, 27, 10
|
|
||||||
-#define COLOR_TEXT_TITLE 233, 229, 227
|
|
||||||
-#define COLOR_TEXT_DIR 75, 70, 164
|
|
||||||
-#define COLOR_TEXT_SELECTED 255, 0, 0
|
|
||||||
-#define COLOR_CURSOR_1 232, 152, 80
|
|
||||||
-#define COLOR_CURSOR_2 232, 201, 173
|
|
||||||
-#define COLOR_BG_1 255, 255, 255
|
|
||||||
-#define COLOR_BG_2 232, 228, 224
|
|
||||||
-#define COLOR_BORDER 102, 85, 74
|
|
||||||
-#define COLOR_BORDER_ERROR 128, 55, 55
|
|
||||||
+#define COLOR_TITLE_BG 40, 44, 52 // Dark slate gray
|
|
||||||
+#define COLOR_KEY 198, 120, 221 // Soft purple
|
|
||||||
+#define COLOR_TEXT_NORMAL 171, 178, 191 // Light gray-blue
|
|
||||||
+#define COLOR_TEXT_TITLE 255, 255, 255 // White
|
|
||||||
+#define COLOR_TEXT_DIR 97, 175, 239 // Soft blue
|
|
||||||
+#define COLOR_TEXT_SELECTED 224, 108, 117 // Soft red
|
|
||||||
+#define COLOR_CURSOR_1 80, 80, 80 // Charcoal gray
|
|
||||||
+#define COLOR_CURSOR_2 100, 100, 100 // Slightly lighter gray
|
|
||||||
+#define COLOR_BG_1 30, 34, 40 // Main dark background
|
|
||||||
+#define COLOR_BG_2 36, 40, 48 // Slightly lighter background
|
|
||||||
+#define COLOR_BORDER 56, 60, 72 // Subtle borders
|
|
||||||
+#define COLOR_BORDER_ERROR 191, 97, 106 // Muted red
|
|
||||||
|
|
||||||
#endif // _DEF_H_
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 1a36617..b716c6a 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -25,10 +25,10 @@ option(USE_SDL2 "Use SDL2 instead of SDL1" ON)
|
|
||||||
option(WITH_SYSTEM_SDL_GFX "Use system SDL_gfx library" OFF)
|
|
||||||
option(WITH_SYSTEM_SDL_TTF "Use system SDL_ttf library" OFF)
|
|
||||||
|
|
||||||
-set(RES_DIR \"res/\" CACHE STRING "Resources directory")
|
|
||||||
+set(RES_DIR \"/usr/share/commander/res/\" CACHE STRING "Resources directory")
|
|
||||||
set(FILE_SYSTEM \"/dev/mmcblk1p1\" CACHE STRING "Default filesystem (for Disk info)")
|
|
||||||
-set(PATH_DEFAULT "" CACHE STRING "Default path for the left pane (default: getenv(\"PWD\")")
|
|
||||||
-set(PATH_DEFAULT_RIGHT "" CACHE STRING "Default path for the right pane (default: getenv(\"HOME\")")
|
|
||||||
+set(PATH_DEFAULT \"/storage/.config/\" CACHE STRING "Default path for the left pane (default: getenv(\"HOME\")")
|
|
||||||
+set(PATH_DEFAULT_RIGHT \"/storage/.config/\" CACHE STRING "Default path for the right pane (default: getenv(\"HOME\")")
|
|
||||||
set(AUTOSCALE 1 CACHE STRING "Auto-detect resolution (maximize on startup if there is a windowing system)")
|
|
||||||
set(AUTOSCALE_DPI 1 CACHE STRING "Auto-detect DPI scaling factors")
|
|
||||||
set(WITH_SYSTEM_SDL_TTF OFF CACHE BOOL "Use system sdl_ttf")
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
diff --git a/image_viewer.cpp b/image_viewer.cpp
|
|
||||||
index f636344..39d9c87 100644
|
|
||||||
--- a/image_viewer.cpp
|
|
||||||
+++ b/image_viewer.cpp
|
|
||||||
@@ -213,7 +213,7 @@ bool ImageViewer::keyHold()
|
|
||||||
}
|
|
||||||
|
|
||||||
#if SDL_VERSION_ATLEAST(2, 0, 0)
|
|
||||||
-bool CCommander::gamepadHold(SDL_GameController *controller)
|
|
||||||
+bool ImageViewer::gamepadHold(SDL_GameController *controller)
|
|
||||||
{
|
|
||||||
const auto &c = config();
|
|
||||||
if (tick(controller, c.gamepad_up) || tick(controller, c.gamepad_left)) return actionUp();
|
|
||||||
Reference in New Issue
Block a user