From fbcf589a18356a6d86af8437d5f146a88151141f Mon Sep 17 00:00:00 2001 From: tao wang Date: Fri, 18 Nov 2022 10:20:46 +0800 Subject: [PATCH] ENH:change the mall dialog to frame Change-Id: Idee98d2c9a84cca5245c42c60b545fabf31fb037 --- src/slic3r/GUI/ModelMall.cpp | 2 +- src/slic3r/GUI/ModelMall.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/ModelMall.cpp b/src/slic3r/GUI/ModelMall.cpp index ff1e9555ec..ae559ded06 100644 --- a/src/slic3r/GUI/ModelMall.cpp +++ b/src/slic3r/GUI/ModelMall.cpp @@ -14,7 +14,7 @@ namespace Slic3r { namespace GUI { ModelMallDialog::ModelMallDialog(Plater* plater /*= nullptr*/) - :DPIDialog(static_cast(nullptr), wxID_ANY, _L("3D Models"), wxDefaultPosition, wxDefaultSize, wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER) + :DPIFrame(nullptr, wxID_ANY, _L("3D Models"), wxDefaultPosition, wxDefaultSize, wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER) { // icon std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); diff --git a/src/slic3r/GUI/ModelMall.hpp b/src/slic3r/GUI/ModelMall.hpp index a0f2ca7f9e..06b6ebbfe3 100644 --- a/src/slic3r/GUI/ModelMall.hpp +++ b/src/slic3r/GUI/ModelMall.hpp @@ -35,13 +35,13 @@ #include "Widgets/Button.hpp" -#define MODEL_MALL_PAGE_SIZE wxSize(FromDIP(1400 * 0.8), FromDIP(1040 * 0.8)) -#define MODEL_MALL_PAGE_CONTROL_SIZE wxSize(FromDIP(1400 * 0.8), FromDIP(40 * 0.8)) -#define MODEL_MALL_PAGE_WEB_SIZE wxSize(FromDIP(1400 * 0.8), FromDIP(1000 * 0.8)) +#define MODEL_MALL_PAGE_SIZE wxSize(FromDIP(1400 * 0.85), FromDIP(1040 * 0.75)) +#define MODEL_MALL_PAGE_CONTROL_SIZE wxSize(FromDIP(1400 * 0.85), FromDIP(40 * 0.75)) +#define MODEL_MALL_PAGE_WEB_SIZE wxSize(FromDIP(1400 * 0.85), FromDIP(1000 * 0.75)) namespace Slic3r { namespace GUI { - class ModelMallDialog : public DPIDialog + class ModelMallDialog : public DPIFrame { public: ModelMallDialog(Plater* plater = nullptr);