gaozheng
/
geopro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor/pure-qt-ui #3

Merged
gaozheng merged 56 commits from refactor/pure-qt-ui into main 2026-06-10 18:41:53 +08:00
Conversation 0 Commits 56 Files Changed 31 +8 -5
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8d938dd848 - Show all commits

9
CMakeLists.txt
View File

@ -70,14 +70,17 @@ FetchContent_MakeAvailable(qtkeychain)
set(ELAWIDGETTOOLS_BUILD_STATIC_LIB ON CACHE BOOL "" FORCE) set(ELAWIDGETTOOLS_BUILD_STATIC_LIB ON CACHE BOOL "" FORCE)
FetchContent_Declare(elawidgettools FetchContent_Declare(elawidgettools
GIT_REPOSITORY https://github.com/RainbowCandyX/ElaWidgetTools.git GIT_REPOSITORY https://github.com/RainbowCandyX/ElaWidgetTools.git
GIT_TAG main GIT_TAG b80eadc4a199186e14656dce09959b3216a593be # 钉定提交，构建可复现(review H1)
SOURCE_SUBDIR ElaWidgetTools) SOURCE_SUBDIR ElaWidgetTools)
FetchContent_MakeAvailable(elawidgettools) FetchContent_MakeAvailable(elawidgettools)
add_subdirectory(src) add_subdirectory(src)
# ElaWidgetTools 评估 spike（隔离 demo，不属于产品 geopro_desktop；评估完删分支即弃）。 # ElaWidgetTools 评估 spike（隔离 demo，默认不编；评估用 -DGEOPRO_BUILD_ELA_SPIKE=ON 开启，review M4）。
add_subdirectory(spike/ela) option(GEOPRO_BUILD_ELA_SPIKE "Build ElaWidgetTools evaluation spike" OFF)
if(GEOPRO_BUILD_ELA_SPIKE)
add_subdirectory(spike/ela)
endif()
enable_testing() enable_testing()
add_subdirectory(tests) add_subdirectory(tests)

4
src/app/main.cpp
View File

@ -1019,13 +1019,13 @@ int main(int argc, char* argv[])
QWidget* topLevel = nullptr; QWidget* topLevel = nullptr;
if (qEnvironmentVariable("GEOPRO_UI_SHELL") == QLatin1String("ela")) { if (qEnvironmentVariable("GEOPRO_UI_SHELL") == QLatin1String("ela")) {
eApp->init(); // ElaApplication：Fluent 主题/字体/动画基建 eApp->init(); // ElaApplication：Fluent 主题/字体/动画基建
auto* inner = new QMainWindow;
buildWorkbench(*inner, repo, projectRepo, nav);
auto* ela = new ElaWindow; auto* ela = new ElaWindow;
ela->setWindowTitle(kTitle); ela->setWindowTitle(kTitle);
ela->resize(1280, 800); ela->resize(1280, 800);
ela->setMinimumSize(1024, 680); ela->setMinimumSize(1024, 680);
ela->setIsNavigationBarEnable(false); // 纯中心内容，不显示左侧导航栏 ela->setIsNavigationBarEnable(false); // 纯中心内容，不显示左侧导航栏
auto* inner = new QMainWindow(ela); // 以 ela 为父，避免无父期调色板/DPI 抖动(review H3)
buildWorkbench(*inner, repo, projectRepo, nav);
ela->setCentralCustomWidget(inner); // 工作台作为 ElaWindow 中心内容 ela->setCentralCustomWidget(inner); // 工作台作为 ElaWindow 中心内容
topLevel = ela; topLevel = ela;
} else { } else {