juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-15 01:22:07 +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

22
src/slic3r/GUI/MultiMachineManagerPage.cpp
View File

@@ -40,8 +40,8 @@ void MultiMachineItem::OnLeaveWindow(wxMouseEvent& evt)
void MultiMachineItem::OnLeftDown(wxMouseEvent& evt)
{
int left = FromDIP(DEVICE_LEFT_PADDING_LEFT +
DEVICE_LEFT_DEV_NAME +
int left = FromDIP(DEVICE_LEFT_PADDING_LEFT +
DEVICE_LEFT_DEV_NAME +
DEVICE_LEFT_PRO_NAME +
DEVICE_LEFT_PRO_INFO);
auto mouse_pos = ClientToScreen(evt.GetPosition());
@@ -193,7 +193,7 @@ void MultiMachineItem::doRender(wxDC& dc)
wxString left_time = wxString::Format("%s", get_left_time(obj_->mc_left_time));
DrawTextWithEllipsis(dc, progress_info + "% | " + left_time, FromDIP(DEVICE_LEFT_PRO_INFO), left, FromDIP(10));
dc.SetPen(wxPen(wxColour(233,233,233)));
dc.SetBrush(wxBrush(wxColour(233,233,233)));
@@ -320,7 +320,7 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
m_table_head_panel->SetBackgroundColour(TABLE_HEAR_NORMAL_COLOUR);
m_table_head_sizer = new wxBoxSizer(wxHORIZONTAL);
m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE);
m_printer_name = new Button(m_table_head_panel, _L("Device Name"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE);
m_printer_name->SetBackgroundColor(head_bg);
m_printer_name->SetFont(TABLE_HEAD_FONT);
m_printer_name->SetCornerRadius(0);
@@ -341,9 +341,9 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
this->m_sort.set_role(sortcb, SortItem::SR_MACHINE_NAME, device_dev_name_big);
this->refresh_user_device();
});
m_task_name = new Button(m_table_head_panel, _L("Task Name"), "", wxNO_BORDER, ICON_SIZE);
m_task_name = new Button(m_table_head_panel, _L("Task Name"), "", wxNO_BORDER, ICON_SINGLE_SIZE);
m_task_name->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR);
m_task_name->SetFont(TABLE_HEAD_FONT);
m_task_name->SetCornerRadius(0);
@@ -351,9 +351,9 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
m_task_name->SetMaxSize(wxSize(FromDIP(DEVICE_LEFT_DEV_NAME), FromDIP(DEVICE_ITEM_MAX_HEIGHT)));
m_task_name->SetCenter(false);
m_status = new Button(m_table_head_panel, _L("Device Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SIZE);
m_status = new Button(m_table_head_panel, _L("Device Status"), "toolbar_double_directional_arrow", wxNO_BORDER, ICON_SINGLE_SIZE);
m_status->SetBackgroundColor(head_bg);
m_status->SetFont(TABLE_HEAD_FONT);
m_status->SetCornerRadius(0);
@@ -374,9 +374,9 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
this->m_sort.set_role(sortcb, SortItem::SortRule::SR_MACHINE_STATE, device_state_big);
this->refresh_user_device();
});
m_action = new Button(m_table_head_panel, _L("Actions"), "", wxNO_BORDER, ICON_SIZE, false);
m_action = new Button(m_table_head_panel, _L("Actions"), "", wxNO_BORDER, ICON_SINGLE_SIZE, false);
m_action->SetBackgroundColor(TABLE_HEAR_NORMAL_COLOUR);
m_action->SetFont(TABLE_HEAD_FONT);
m_action->SetCornerRadius(0);
@@ -476,7 +476,7 @@ MultiMachineManagerPage::MultiMachineManagerPage(wxWindow* parent)
refresh_user_device();
update_page_number();
});
m_page_num_input = new ::TextInput(m_flipping_panel, wxEmptyString, wxEmptyString, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(50), -1), wxTE_PROCESS_ENTER);
StateColor input_bg(std::pair<wxColour, int>(wxColour("#F0F0F1"), StateColor::Disabled), std::pair<wxColour, int>(*wxWHITE, StateColor::Enabled));
m_page_num_input->SetBackgroundColor(input_bg);