juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-15 17:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:fix warning for icon_size define

Browse Source 
jira: none
Change-Id: I0393677c5c29354aeca41917daecc87721d9d9ce
(cherry picked from commit 97584e0a1e73a0ce2152ce88c1ffd58abfc96c73)
This commit is contained in:
zhou.xu
2024-10-18 14:47:03 +08:00
committed by Noisyfox
parent 6c79e8262a
commit 78229089bf
10 changed files with 52 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/SliceInfoPanel.cpp
View File

@@ -4,12 +4,12 @@
#include "I18N.hpp"
#include "Widgets/Label.hpp"
#include "libslic3r/Utils.hpp"
#include "GUI_App.hpp"//for ICON_SIZE (wxSize(FromDIP(16), FromDIP(16)))
namespace Slic3r {
namespace GUI {
#define THUMBNAIL_SIZE (wxSize(FromDIP(60), FromDIP(60)))
#define ICON_SIZE (wxSize(FromDIP(16), FromDIP(16)))
#define PRINT_ICON_SIZE (wxSize(FromDIP(18), FromDIP(18)))
wxIMPLEMENT_CLASS(SliceInfoPopup, PopupWindow);
@@ -23,14 +23,6 @@ wxEND_EVENT_TABLE()
static wxColour BUTTON_BORDER_COL = wxColour(255, 255, 255);
inline int hex_digit_to_int(const char c)
{
return
(c >= '0' && c <= '9') ? int(c - '0') :
(c >= 'A' && c <= 'F') ? int(c - 'A') + 10 :
(c >= 'a' && c <= 'f') ? int(c - 'a') + 10 : -1;
}
inline float calc_gray(wxColour color)
{
return 0.299 * (float) color.Red() + 0.587 * (float) color.Green() + 0.114 * (float) color.Blue();
@@ -183,7 +175,7 @@ SliceInfoPanel::SliceInfoPanel(wxWindow *parent, wxBitmap &prediction, wxBitmap
this->SetBackgroundColour(*wxWHITE);
m_item_top_sizer = new wxBoxSizer(wxHORIZONTAL);
m_bmp_item_thumbnail = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW | 0);
m_bmp_item_thumbnail->SetMinSize(THUMBNAIL_SIZE);
m_bmp_item_thumbnail->SetSize(THUMBNAIL_SIZE);