mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-29 22:02:10 +00:00
63044b7661
* Add wxInspector dep
* Initial intergration of wxInspector
* docs: add wxInspector plugins design spec
Design spec for two wxInspector plugins (DPIAware + CustomWidgets) that expose
OrcaSlicer's custom control properties in the inspector property grid.
Covers: DPIAware scale-factor properties, Button, CheckBox, TextInput,
SwitchButton, ProgressBar, Label, and LabeledStaticBox.
* docs: add wxInspector plugins implementation plan
6-task plan covering: source changes to existing widget headers,
DPIAwarePlugin, CustomWidgetsPlugin, registration helper,
MainFrame/CMake wiring, and build verification.
* feat: add getters/setters for wxInspector plugin access
Add minimal public accessors to DPIAware (set_scale_factor,
set_prev_scale_factor, set_em_unit, force_rescale), Button
(GetStyle, GetType, IsSelected), CheckBox (IsHalfChecked),
TextInput (GetCornerRadius), and LabeledStaticBox
(GetCornerRadius, GetBorderWidth, GetBorderColor, GetScale).
* feat: add wxInspector plugin registration helper
Add RegisterOrcaInspectorPlugins() inline function that creates
and registers the DPIAwarePlugin and CustomWidgetsPlugin as
static instances (matching wxInspector's built-in pattern).
* feat: add DPIAware wxInspector plugin
Exposes DPI scaling properties (scale_factor, prev_scale_factor,
em_unit, normal_font, force_rescale) on DPIFrame and DPIDialog
widgets. Uses dynamic_cast for detection and a template helper
to capture the correct static type for lambda accessors.
* feat: add OrcaCustomWidgets wxInspector plugin
Exposes Orca-specific properties on 7 widget types:
- Button: Style, Type, Selected
- CheckBox: Half Checked
- TextInput: Label, Text Value, Corner Radius
- SwitchButton: Value
- ProgressBar: Proportion, Show Number
- Label: Is Hyperlink, Font Point Size
- LabeledStaticBox: Corner Radius, Border Width, Border Color, Scale
Each widget type uses dynamic_cast for safe detection.
* feat: wire wxInspector plugins into MainFrame and build
Call RegisterOrcaInspectorPlugins() in MainFrame constructor after
SetupInspectorAccelerator(). Add all 5 plugin source files to
SLIC3R_GUI_SOURCES in CMakeLists.txt.
* fix: move plugin registration to GUI_App::on_init_inner
Register plugins once in app init rather than in MainFrame
constructor, which may be recreated during the application
lifetime.
* fix: include plugin headers in Registration.hpp for complete types
Static locals require complete type. Include DPIAwarePlugin.hpp and
CustomWidgetsPlugin.hpp instead of forward-declaring. Also remove
unused include from MainFrame.cpp (registration moved to GUI_App).
* fix: qualify DPIFrame/DPIDialog with Slic3r::GUI namespace
* Make DPIDialog inspectable. For other dialogs, we will add them if necessary later.
* docs: add spec for moving wxInspectable into DPIAware template
Move wxInspector::wxInspectable base class from DPIDialog and MainFrame
into the common DPIAware<P> template, making all DPIAware widgets
automatically visible in the inspector tree.
Co-Authored-By: Claude <noreply@anthropic.com>
* docs: add implementation plan for moving wxInspectable into DPIAware
Co-Authored-By: Claude <noreply@anthropic.com>
* docs: update spec/plan — move SetupInspectorAccelerator into DPIAware too
Co-Authored-By: Claude <noreply@anthropic.com>
* refactor: move wxInspectable and SetupInspectorAccelerator into DPIAware
DPIAware<P> now inherits wxInspector::wxInspectable and calls
SetupInspectorAccelerator in its constructor, making all DPIAware
widgets automatically appear in the inspector tree with the
Ctrl+Shift+I shortcut. DPIDialog now uses 'using' to inherit the
constructor. Remove redundant wxInspectable inheritance and
SetupInspectorAccelerator calls from DPIDialog and MainFrame.
Co-Authored-By: Claude <noreply@anthropic.com>
* fix: use LB_HYPERLINK constant instead of magic number 0x0020
Co-Authored-By: Claude <noreply@anthropic.com>
* Clean up
* Fix Linux build
* Don't build wxInspector sample
* Use shallow clone
* Try fix flatpak build
* Attempt to fix build again
* Fix build failure caused by 436c16135e
* wxWidgets build only download required submodules
* This should fix build on Windows on ARM
* Enable PIC
* Disable layout inspector by default for public release
* Use wxInspector 1.0.0 release
---------
Co-authored-by: Claude <noreply@anthropic.com>
86 lines
2.4 KiB
CMake
86 lines
2.4 KiB
CMake
set(_wx_toolkit "")
|
|
set(_wx_debug_postfix "")
|
|
set(_wx_shared -DwxBUILD_SHARED=OFF)
|
|
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
|
set(_gtk_ver 2)
|
|
|
|
if (DEP_WX_GTK3)
|
|
set(_gtk_ver 3)
|
|
endif ()
|
|
|
|
set(_wx_toolkit "-DwxBUILD_TOOLKIT=gtk${_gtk_ver}")
|
|
if (FLATPAK)
|
|
set(_wx_debug_postfix "d")
|
|
set(_wx_shared -DwxBUILD_SHARED=ON -DBUILD_SHARED_LIBS:BOOL=ON)
|
|
endif ()
|
|
endif()
|
|
|
|
if (MSVC)
|
|
set(_wx_edge "-DwxUSE_WEBVIEW_EDGE=ON")
|
|
else ()
|
|
set(_wx_edge "-DwxUSE_WEBVIEW_EDGE=OFF")
|
|
endif ()
|
|
|
|
orcaslicer_add_cmake_project(
|
|
wxWidgets
|
|
GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets"
|
|
GIT_TAG v3.3.2
|
|
GIT_SHALLOW ON
|
|
GIT_SUBMODULES 3rdparty/catch 3rdparty/pcre 3rdparty/libwebp
|
|
DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${JPEG_PKG}
|
|
CMAKE_ARGS
|
|
-DwxBUILD_PRECOMP=ON
|
|
${_wx_toolkit}
|
|
"-DCMAKE_DEBUG_POSTFIX:STRING=${_wx_debug_postfix}"
|
|
-DwxBUILD_DEBUG_LEVEL=0
|
|
-DwxBUILD_SAMPLES=OFF
|
|
${_wx_shared}
|
|
-DwxUSE_MEDIACTRL=ON
|
|
-DwxUSE_DETECT_SM=OFF
|
|
-DwxUSE_PRIVATE_FONTS=ON
|
|
-DwxUSE_OPENGL=ON
|
|
-DwxUSE_GLCANVAS_EGL=ON
|
|
-DwxUSE_WEBREQUEST=ON
|
|
-DwxUSE_WEBVIEW=ON
|
|
${_wx_edge}
|
|
-DwxUSE_WEBVIEW_IE=OFF
|
|
-DwxUSE_REGEX=builtin
|
|
-DwxUSE_LIBSDL=OFF
|
|
-DwxUSE_XTEST=OFF
|
|
-DwxUSE_STC=OFF
|
|
-DwxUSE_AUI=ON
|
|
-DwxUSE_LIBPNG=sys
|
|
-DwxUSE_ZLIB=sys
|
|
-DwxUSE_LIBJPEG=sys
|
|
-DwxUSE_LIBTIFF=OFF
|
|
-DwxUSE_LIBWEBP=builtin
|
|
-DwxUSE_EXPAT=sys
|
|
-DwxUSE_NANOSVG=OFF
|
|
)
|
|
|
|
# wxWidgets 3.3 cmake install doesn't include private headers.
|
|
# OrcaSlicer uses some of the private headers (for accessibility support).
|
|
# Copy the private headers directory after install.
|
|
if(MSVC)
|
|
set(_wx_inc_dest ${DESTDIR}/include/wx)
|
|
else()
|
|
set(_wx_inc_dest ${DESTDIR}/include/wx-3.3/wx)
|
|
endif()
|
|
ExternalProject_Add_Step(dep_wxWidgets copy_private_headers
|
|
DEPENDEES install
|
|
COMMENT "Copying wxWidgets private headers"
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
|
<SOURCE_DIR>/include/wx/private
|
|
${_wx_inc_dest}/private
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
|
<SOURCE_DIR>/include/wx/generic/private
|
|
${_wx_inc_dest}/generic/private
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
|
<SOURCE_DIR>/include/wx/gtk/private
|
|
${_wx_inc_dest}/gtk/private
|
|
)
|
|
|
|
if (MSVC)
|
|
add_debug_dep(dep_wxWidgets)
|
|
endif ()
|