From 4cec4b0d4abedce50a1895e56b0baca6b9556e8c Mon Sep 17 00:00:00 2001 From: CLARATION Date: Thu, 10 Sep 2026 21:24:44 -0700 Subject: [PATCH] fix(gui): use `wxSP_WRAP` on linux --- .github/workflows/build.yml | 8 ++++---- .gitignore | 1 + {packaging => resources}/background.png | Bin {packaging => resources}/control | 0 {packaging => resources}/drive.icns | Bin src/wx/DfuPanel.cpp | 6 +++++- src/wx/ExploitPanel.cpp | 6 +++++- src/wx/MainPanel.cpp | 12 ++++++++++-- src/wx/RecoveryPanel.cpp | 6 +++++- src/wx/SettingsPanel.cpp | 15 +++++++++++++-- 10 files changed, 43 insertions(+), 11 deletions(-) rename {packaging => resources}/background.png (100%) rename {packaging => resources}/control (100%) rename {packaging => resources}/drive.icns (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16378e8..62d6489 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -329,8 +329,8 @@ jobs: mkdir -p palera1n-iphoneos-arm/DEBIAN tar -xf palera1n-iphoneos-arm64.tar.gz -C palera1n-iphoneos-arm64 tar -xf palera1n-iphoneos-arm.tar.gz -C palera1n-iphoneos-arm - cp ../packaging/control palera1n-iphoneos-arm64/DEBIAN/control - cp ../packaging/control palera1n-iphoneos-arm/DEBIAN/control + cp ../resources/control palera1n-iphoneos-arm64/DEBIAN/control + cp ../resources/control palera1n-iphoneos-arm/DEBIAN/control VERSION=$(grep '^#define PALERAIN_VERSION' ../src/globals.h | cut -d'"' -f2 | tr -cd '0-9.') @@ -388,8 +388,8 @@ jobs: run: | create-dmg \ --volname "palera1n-macos-universal" \ - --volicon "packaging/drive.icns" \ - --background "packaging/background.png" \ + --volicon "resources/drive.icns" \ + --background "resources/background.png" \ --window-pos 200 120 \ --window-size 510 350 \ --icon-size 100 \ diff --git a/.gitignore b/.gitignore index 6bdf1f9..67dccf8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ embedded/binpack.dmg embedded/DFUHelperDeviceInfo-minified.json apple-include-* +*-unknown-* libusbK/ libusbK-tmp/ diff --git a/packaging/background.png b/resources/background.png similarity index 100% rename from packaging/background.png rename to resources/background.png diff --git a/packaging/control b/resources/control similarity index 100% rename from packaging/control rename to resources/control diff --git a/packaging/drive.icns b/resources/drive.icns similarity index 100% rename from packaging/drive.icns rename to resources/drive.icns diff --git a/src/wx/DfuPanel.cpp b/src/wx/DfuPanel.cpp index 3763bf7..9fa2af2 100644 --- a/src/wx/DfuPanel.cpp +++ b/src/wx/DfuPanel.cpp @@ -75,7 +75,11 @@ DfuPanel::DfuPanel(MainFrame* frame, wxWindow* parent) "Time to put the device into DFU mode.", wxDefaultPosition, wxDefaultSize, - wxST_WRAP + #ifdef __linux__ + wxSP_WRAP + #else + wxST_WRAP + #endif ); left->Add(m_headerText, 0, wxTOP | wxLEFT | wxRIGHT, 10); diff --git a/src/wx/ExploitPanel.cpp b/src/wx/ExploitPanel.cpp index 839198f..c85050f 100644 --- a/src/wx/ExploitPanel.cpp +++ b/src/wx/ExploitPanel.cpp @@ -78,7 +78,11 @@ ExploitPanel::ExploitPanel(MainFrame* frame, wxWindow* parent) left->Add(new wxStaticText(this, wxID_ANY, "Installing jailbreak, this will take a moment. Do not disconnect the device until finished.", wxDefaultPosition, wxDefaultSize, - wxST_WRAP + #ifdef __linux__ + wxSP_WRAP + #else + wxST_WRAP + #endif ), 0, wxALL, 10); left->Add(m_statusText, 0, wxALL, 10); left->Add(m_progressBar, 0, wxALL | wxEXPAND, 20); diff --git a/src/wx/MainPanel.cpp b/src/wx/MainPanel.cpp index fb1a366..e0cb49d 100644 --- a/src/wx/MainPanel.cpp +++ b/src/wx/MainPanel.cpp @@ -81,7 +81,11 @@ MainPanel::MainPanel(MainFrame* frame, wxWindow* parent) "Cameron Katri, Keto et al.)", wxDefaultPosition, wxDefaultSize, - wxST_WRAP + #ifdef __linux__ + wxSP_WRAP + #else + wxST_WRAP + #endif ); auto* twitterLabel = new wxStaticText(this, wxID_ANY, "Twitter:"); @@ -167,7 +171,11 @@ MainPanel::MainPanel(MainFrame* frame, wxWindow* parent) "NOTE: Please ensure you've made a backup of your device before proceeding.\n", wxDefaultPosition, wxDefaultSize, - wxST_WRAP + #ifdef __linux__ + wxSP_WRAP + #else + wxST_WRAP + #endif ); wxFont noteFont = warningNote->GetFont(); diff --git a/src/wx/RecoveryPanel.cpp b/src/wx/RecoveryPanel.cpp index 0d6a625..490200f 100644 --- a/src/wx/RecoveryPanel.cpp +++ b/src/wx/RecoveryPanel.cpp @@ -88,7 +88,11 @@ RecoveryPanel::RecoveryPanel(MainFrame* frame, wxWindow* parent) "The device needs to be put into DFU mode to apply the jailbreak. This is a manual process and we will guide you through it.", wxDefaultPosition, wxDefaultSize, - wxST_WRAP + #ifdef __linux__ + wxSP_WRAP + #else + wxST_WRAP + #endif ), 0, wxALL, 10); left->Add(m_statusText, 0, wxALL, 10); diff --git a/src/wx/SettingsPanel.cpp b/src/wx/SettingsPanel.cpp index 0ac8a0a..e3bd9ad 100644 --- a/src/wx/SettingsPanel.cpp +++ b/src/wx/SettingsPanel.cpp @@ -58,7 +58,14 @@ auto createTitle = [](wxWindow* parent, const wxString& text) auto createDescription = [](wxWindow* parent, const wxString& text) { - auto* description = new wxStaticText(parent, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, wxST_WRAP); + auto* description = new wxStaticText( + parent, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, + #ifdef __linux__ + wxSP_WRAP + #else + wxST_WRAP + #endif + ); wxFont font = description->GetFont(); font.SetPointSize(font.GetPointSize() - 2); @@ -85,7 +92,11 @@ SettingsPanel::SettingsPanel(MainFrame* frame, wxWindow* parent) "You may set the following options. If you don't know what they mean you'll probably have no reason to set them.", wxDefaultPosition, wxDefaultSize, - wxST_WRAP + #ifdef __linux__ + wxSP_WRAP + #else + wxST_WRAP + #endif ), 0, wxTOP | wxLEFT | wxRIGHT, 10); auto* notebook = new wxNotebook(this, wxID_ANY);