diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 69e798e42..0eda100be 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -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(); } diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index 6c3b43f25..3cae32e18 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -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); } } diff --git a/src/slic3r/GUI/Widgets/AMSControl.hpp b/src/slic3r/GUI/Widgets/AMSControl.hpp index 0751e6830..2decf228e 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.hpp +++ b/src/slic3r/GUI/Widgets/AMSControl.hpp @@ -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};