mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:K value and ? overlapping and AMS selection display 

JIRA: STUDIO-3777
Change-Id: I59c9fd44bd23aaf26bfbad17e618eb5440ca7db3
This commit is contained in:
hu.wang 2023-09-08 10:46:51 +08:00 committed by Lane.Wei
parent 1340eccb87
commit 3c9ea83ede
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/ReleaseNote.cpp
View File

@ -1185,7 +1185,7 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow* parent)
m_step_icon_panel1->SetMaxSize(wxSize(-1, m_tip1->GetBestSize().y));
m_sizer_msg->Add(0, 0, 0, wxALIGN_CENTER, FromDIP(20));
m_sizer_msg->Add(m_img_step3, 0, wxALIGN_CENTER | wxALL, FromDIP(5));
m_sizer_msg->Add(m_img_step3, 0, wxALL, FromDIP(5));
m_sizer_msg->Add(0, 0, 0, wxALIGN_CENTER, FromDIP(8));
m_sizer_msg->Add(m_tip4, 0, wxALIGN_CENTER | wxEXPAND | wxLEFT, FromDIP(5));
m_img_step3->Hide();
@ -1470,7 +1470,7 @@ void InputIpAddressDialog::on_check_ip_address_failed(wxCommandEvent& evt)
update_test_msg(_L("Connection failed! If your IP and Access Code is correct, \nplease move to step 3 for troubleshooting network issues"), false);
m_img_step3->Show();
m_tip4->Show();
m_trouble_shoot->Show();
//m_trouble_shoot->Show();
Layout();
Fit();
}

18
src/slic3r/GUI/Widgets/AMSControl.cpp
View File

@ -866,8 +866,15 @@ void AMSLib::render_generic_text(wxDC &dc)
if (m_info.material_name.empty() /*&& m_info.material_state != AMSCanType::AMS_CAN_TYPE_VIRTUAL*/) {
auto tsize = dc.GetMultiLineTextExtent("?");
auto pot = wxPoint(0, 0);
pot = wxPoint((libsize.x - tsize.x) / 2, (libsize.y - tsize.y) / 2 - FromDIP(9));
if (m_obj && show_k_value) {
pot = wxPoint((libsize.x - tsize.x) / 2, (libsize.y - tsize.y) / 2 - FromDIP(9));
}
else {
pot = wxPoint((libsize.x - tsize.x) / 2, (libsize.y - tsize.y) / 2 + FromDIP(3));
}
dc.DrawText(L("?"), pot);
}
else {
auto tsize = dc.GetMultiLineTextExtent(m_info.material_name);
@ -1673,15 +1680,16 @@ void AMSItem::doRender(wxDC &dc)
if (!wxWindow::IsEnabled()) { border_colour = AMS_CONTROL_DISABLE_COLOUR; }
if (m_hover) {
dc.SetPen(wxPen(border_colour, 1));
dc.SetPen(wxPen(border_colour, 2));
dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));
dc.DrawRoundedRectangle(0, 0, size.x, size.y, 3);
dc.DrawRoundedRectangle(1, 1, size.x - 1, size.y - 1, 3);
}
if (m_selected) {
dc.SetPen(wxPen(border_colour, 1));
dc.SetPen(wxPen(border_colour, 2));
dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));
dc.DrawRoundedRectangle(0, 0, size.x, size.y, 3);
dc.DrawRoundedRectangle(1, 1, size.x-1, size.y-1, 3);
}
}

2
src/slic3r/GUI/Widgets/AMSControl.hpp
View File

@ -431,7 +431,7 @@ public:
protected:
wxSize m_cube_size;
wxColour m_background_colour = {AMS_CONTROL_DEF_BLOCK_BK_COLOUR};
int m_padding = {6};
int m_padding = {7};
int m_space = {5};
bool m_hover = {false};
bool m_selected = {false};