mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-19 19:33:47 +00:00
FIX: remove some unnecessary refresh to reduce page faults
jira: [none] Change-Id: If4dae82f7aae243db033fe9c8d4d1ab25f625557 (cherry picked from commit b1fa2421c0425ad077b899e1d793cde219826042)
This commit is contained in:
@@ -687,7 +687,6 @@ void AMSextruder::OnAmsLoading(bool load, int nozzle_id, wxColour col /*= AMS_CO
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Refresh();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMSextruder::updateNozzleNum(int nozzle_num)
|
void AMSextruder::updateNozzleNum(int nozzle_num)
|
||||||
@@ -2286,21 +2285,25 @@ void AMSRoadDownPart::doRender(wxDC& dc)
|
|||||||
void AMSRoadDownPart::UpdatePassRoad(AMSPanelPos pos, int len, AMSPassRoadSTEP step) {
|
void AMSRoadDownPart::UpdatePassRoad(AMSPanelPos pos, int len, AMSPassRoadSTEP step) {
|
||||||
if (m_nozzle_num >= 2){
|
if (m_nozzle_num >= 2){
|
||||||
if (pos == AMSPanelPos::LEFT_PANEL){
|
if (pos == AMSPanelPos::LEFT_PANEL){
|
||||||
|
if (m_left_road_length == len && m_pass_road_left_step == step){ return; }
|
||||||
m_left_road_length = len;;
|
m_left_road_length = len;;
|
||||||
m_pass_road_left_step = step;
|
m_pass_road_left_step = step;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
if (m_right_road_length == len && m_pass_road_right_step == step) { return; }
|
||||||
m_right_road_length = len;
|
m_right_road_length = len;
|
||||||
m_pass_road_right_step = step;
|
m_pass_road_right_step = step;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
if (pos == AMSPanelPos::LEFT_PANEL) {
|
if (pos == AMSPanelPos::LEFT_PANEL) {
|
||||||
|
if (m_left_road_length == len && m_pass_road_left_step == step && m_right_road_length == -1) { return; }
|
||||||
m_left_road_length = len;
|
m_left_road_length = len;
|
||||||
m_right_road_length = -1;
|
m_right_road_length = -1;
|
||||||
m_pass_road_left_step = step;
|
m_pass_road_left_step = step;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
if (m_right_road_length == len && m_pass_road_right_step == step && m_left_road_length == -1) { return; }
|
||||||
m_right_road_length = len;
|
m_right_road_length = len;
|
||||||
m_left_road_length = -1;
|
m_left_road_length = -1;
|
||||||
m_pass_road_right_step = step;
|
m_pass_road_right_step = step;
|
||||||
|
|||||||
@@ -113,10 +113,14 @@ void ProgressBar::Reset()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ProgressBar::SetProgress(int step)
|
void ProgressBar::SetProgress(int step)
|
||||||
{
|
{
|
||||||
m_disable = false;
|
|
||||||
if (step < 0) return;
|
if (step < 0) return;
|
||||||
//if (step == m_step) return;
|
if (m_disable == false && m_step == step)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
m_disable = false;
|
||||||
m_step = step;
|
m_step = step;
|
||||||
Refresh();
|
Refresh();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -291,7 +291,7 @@ void wxCheckListBoxComboPopup::OnCheckListBox(wxCommandEvent& evt)
|
|||||||
|
|
||||||
void wxCheckListBoxComboPopup::OnListBoxSelection(wxCommandEvent& evt)
|
void wxCheckListBoxComboPopup::OnListBoxSelection(wxCommandEvent& evt)
|
||||||
{
|
{
|
||||||
// transforms list box item selection event into checklistbox item toggle event
|
// transforms list box item selection event into checklistbox item toggle event
|
||||||
|
|
||||||
int selId = GetSelection();
|
int selId = GetSelection();
|
||||||
if (selId != wxNOT_FOUND)
|
if (selId != wxNOT_FOUND)
|
||||||
@@ -392,8 +392,8 @@ void msw_buttons_rescale(wxDialog* dlg, const int em_unit, const std::vector<int
|
|||||||
|
|
||||||
/* Function for getting of em_unit value from correct parent.
|
/* Function for getting of em_unit value from correct parent.
|
||||||
* In most of cases it is m_em_unit value from GUI_App,
|
* In most of cases it is m_em_unit value from GUI_App,
|
||||||
* but for DPIDialogs it's its own value.
|
* but for DPIDialogs it's its own value.
|
||||||
* This value will be used to correct rescale after moving between
|
* This value will be used to correct rescale after moving between
|
||||||
* Displays with different HDPI */
|
* Displays with different HDPI */
|
||||||
int em_unit(wxWindow* win)
|
int em_unit(wxWindow* win)
|
||||||
{
|
{
|
||||||
@@ -407,7 +407,7 @@ int em_unit(wxWindow* win)
|
|||||||
if (frame)
|
if (frame)
|
||||||
return frame->em_unit();
|
return frame->em_unit();
|
||||||
}
|
}
|
||||||
|
|
||||||
return Slic3r::GUI::wxGetApp().em_unit();
|
return Slic3r::GUI::wxGetApp().em_unit();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -428,9 +428,9 @@ wxBitmap create_menu_bitmap(const std::string& bmp_name)
|
|||||||
// win is used to get a correct em_unit value
|
// win is used to get a correct em_unit value
|
||||||
// It's important for bitmaps of dialogs.
|
// It's important for bitmaps of dialogs.
|
||||||
// if win == nullptr, em_unit value of MainFrame will be used
|
// if win == nullptr, em_unit value of MainFrame will be used
|
||||||
wxBitmap create_scaled_bitmap( const std::string& bmp_name_in,
|
wxBitmap create_scaled_bitmap( const std::string& bmp_name_in,
|
||||||
wxWindow *win/* = nullptr*/,
|
wxWindow *win/* = nullptr*/,
|
||||||
const int px_cnt/* = 16*/,
|
const int px_cnt/* = 16*/,
|
||||||
const bool grayscale/* = false*/,
|
const bool grayscale/* = false*/,
|
||||||
const std::string& new_color/* = std::string()*/, // color witch will used instead of orange
|
const std::string& new_color/* = std::string()*/, // color witch will used instead of orange
|
||||||
const bool menu_bitmap/* = false*/,
|
const bool menu_bitmap/* = false*/,
|
||||||
@@ -448,7 +448,7 @@ wxBitmap create_scaled_bitmap( const std::string& bmp_name_in,
|
|||||||
std::string bmp_name = bmp_name_in;
|
std::string bmp_name = bmp_name_in;
|
||||||
boost::replace_last(bmp_name, ".png", "");
|
boost::replace_last(bmp_name, ".png", "");
|
||||||
|
|
||||||
bool dark_mode =
|
bool dark_mode =
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
menu_bitmap ? Slic3r::GUI::check_dark_mode() :
|
menu_bitmap ? Slic3r::GUI::check_dark_mode() :
|
||||||
#endif
|
#endif
|
||||||
@@ -654,9 +654,9 @@ void apply_extruder_selector(Slic3r::GUI::BitmapComboBox** ctrl,
|
|||||||
// LockButton
|
// LockButton
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
LockButton::LockButton( wxWindow *parent,
|
LockButton::LockButton( wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxPoint& pos /*= wxDefaultPosition*/,
|
const wxPoint& pos /*= wxDefaultPosition*/,
|
||||||
const wxSize& size /*= wxDefaultSize*/):
|
const wxSize& size /*= wxDefaultSize*/):
|
||||||
wxButton(parent, id, wxEmptyString, pos, size, wxBU_EXACTFIT | wxNO_BORDER)
|
wxButton(parent, id, wxEmptyString, pos, size, wxBU_EXACTFIT | wxNO_BORDER)
|
||||||
{
|
{
|
||||||
@@ -768,22 +768,22 @@ void ModeButton::SetState(const bool state)
|
|||||||
|
|
||||||
void ModeButton::focus_button(const bool focus)
|
void ModeButton::focus_button(const bool focus)
|
||||||
{
|
{
|
||||||
const wxFont& new_font = focus ?
|
const wxFont& new_font = focus ?
|
||||||
Slic3r::GUI::wxGetApp().bold_font() :
|
Slic3r::GUI::wxGetApp().bold_font() :
|
||||||
Slic3r::GUI::wxGetApp().normal_font();
|
Slic3r::GUI::wxGetApp().normal_font();
|
||||||
|
|
||||||
SetFont(new_font);
|
SetFont(new_font);
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
GetParent()->Refresh(); // force redraw a background of the selected mode button
|
GetParent()->Refresh(); // force redraw a background of the selected mode button
|
||||||
#else
|
#else
|
||||||
SetForegroundColour(wxSystemSettings::GetColour(focus ? wxSYS_COLOUR_BTNTEXT :
|
SetForegroundColour(wxSystemSettings::GetColour(focus ? wxSYS_COLOUR_BTNTEXT :
|
||||||
#if defined (__linux__) && defined (__WXGTK3__)
|
#if defined (__linux__) && defined (__WXGTK3__)
|
||||||
wxSYS_COLOUR_GRAYTEXT
|
wxSYS_COLOUR_GRAYTEXT
|
||||||
#elif defined (__linux__) && defined (__WXGTK2__)
|
#elif defined (__linux__) && defined (__WXGTK2__)
|
||||||
wxSYS_COLOUR_BTNTEXT
|
wxSYS_COLOUR_BTNTEXT
|
||||||
#else
|
#else
|
||||||
wxSYS_COLOUR_BTNSHADOW
|
wxSYS_COLOUR_BTNSHADOW
|
||||||
#endif
|
#endif
|
||||||
));
|
));
|
||||||
#endif /* no _WIN32 */
|
#endif /* no _WIN32 */
|
||||||
|
|
||||||
@@ -813,7 +813,7 @@ ModeSizer::ModeSizer(wxWindow *parent, int hgap/* = 0*/) :
|
|||||||
Slic3r::GUI::wxGetApp().save_mode(mode_id);
|
Slic3r::GUI::wxGetApp().save_mode(mode_id);
|
||||||
event.Skip();
|
event.Skip();
|
||||||
};
|
};
|
||||||
|
|
||||||
m_mode_btns.reserve(3);
|
m_mode_btns.reserve(3);
|
||||||
for (const auto& button : buttons) {
|
for (const auto& button : buttons) {
|
||||||
m_mode_btns.push_back(new ModeButton(parent, button.first, button.second, mode_icon_px_size()));
|
m_mode_btns.push_back(new ModeButton(parent, button.first, button.second, mode_icon_px_size()));
|
||||||
@@ -878,9 +878,9 @@ void MenuWithSeparators::SetSecondSeparator()
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// BambuBitmap
|
// BambuBitmap
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
ScalableBitmap::ScalableBitmap( wxWindow *parent,
|
ScalableBitmap::ScalableBitmap( wxWindow *parent,
|
||||||
const std::string& icon_name/* = ""*/,
|
const std::string& icon_name/* = ""*/,
|
||||||
const int px_cnt/* = 16*/,
|
const int px_cnt/* = 16*/,
|
||||||
const bool grayscale/* = false*/,
|
const bool grayscale/* = false*/,
|
||||||
const bool resize/* = false*/,
|
const bool resize/* = false*/,
|
||||||
const bool bitmap2/* = false*/,
|
const bool bitmap2/* = false*/,
|
||||||
@@ -971,10 +971,10 @@ ScalableButton::ScalableButton( wxWindow * parent,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ScalableButton::ScalableButton( wxWindow * parent,
|
ScalableButton::ScalableButton( wxWindow * parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const ScalableBitmap& bitmap,
|
const ScalableBitmap& bitmap,
|
||||||
const wxString& label /*= wxEmptyString*/,
|
const wxString& label /*= wxEmptyString*/,
|
||||||
long style /*= wxBU_EXACTFIT | wxNO_BORDER*/) :
|
long style /*= wxBU_EXACTFIT | wxNO_BORDER*/) :
|
||||||
m_parent(parent),
|
m_parent(parent),
|
||||||
m_current_icon_name(bitmap.name()),
|
m_current_icon_name(bitmap.name()),
|
||||||
@@ -995,6 +995,11 @@ void ScalableButton::SetBitmap_(const ScalableBitmap& bmp)
|
|||||||
|
|
||||||
bool ScalableButton::SetBitmap_(const std::string& bmp_name)
|
bool ScalableButton::SetBitmap_(const std::string& bmp_name)
|
||||||
{
|
{
|
||||||
|
if (m_current_icon_name == bmp_name)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
m_current_icon_name = bmp_name;
|
m_current_icon_name = bmp_name;
|
||||||
if (m_current_icon_name.empty())
|
if (m_current_icon_name.empty())
|
||||||
return false;
|
return false;
|
||||||
@@ -1037,7 +1042,7 @@ void ScalableButton::msw_rescale()
|
|||||||
if (!m_current_icon_name.empty()) {
|
if (!m_current_icon_name.empty()) {
|
||||||
wxBitmap bmp = create_scaled_bitmap(m_current_icon_name, m_parent, m_px_cnt);
|
wxBitmap bmp = create_scaled_bitmap(m_current_icon_name, m_parent, m_px_cnt);
|
||||||
SetBitmap(bmp);
|
SetBitmap(bmp);
|
||||||
// BBS: why disappear on hover? why current HBITMAP differ from other
|
// BBS: why disappear on hover? why current HBITMAP differ from other
|
||||||
//SetBitmapCurrent(bmp);
|
//SetBitmapCurrent(bmp);
|
||||||
//SetBitmapPressed(bmp);
|
//SetBitmapPressed(bmp);
|
||||||
//SetBitmapFocus(bmp);
|
//SetBitmapFocus(bmp);
|
||||||
|
|||||||
Reference in New Issue
Block a user