3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-03-11 13:56:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

FIX:If there is no line break, use a better width

Browse source 
jira: none
Change-Id: I98b796f1aeb7cb5d0810cfd1d2f7eaeb03ecf226
(cherry picked from commit 17beeb0f86a4f3e1f6a91ae94fdcb4a0e4f5f4a8)
This commit is contained in:
zhou.xu 2025-03-13 16:33:16 +08:00 • committed by Noisyfox
parent 5880625b9c
commit 8014c57963
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/slic3r/GUI/MsgDialog.cpp
View file

@ -288,10 +288,16 @@ static void add_msg_content(wxWindow *parent,
page_size = wxSize(info_width, page_height);
}
else {
// Extra line breaks in message dialog
wxClientDC dc(parent);
wxSize msg_sz = dc.GetMultiLineTextExtent(msg);
page_size = wxSize(std::min(msg_sz.GetX(), info_width), std::min(msg_sz.GetY(), info_width));
// Extra line breaks in message dialog
if (link_text.IsEmpty() && !link_callback && is_marked_msg == false) {//for common text
html->Destroy();
if (msg_sz.GetX() < info_width) {//No need for line breaks
info_width = msg_sz.GetX();
}
wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL);
scrolledWindow->SetBackgroundColour(*wxWHITE);
scrolledWindow->SetScrollRate(0, 20);
@ -311,11 +317,6 @@ static void add_msg_content(wxWindow *parent,
content_sizer->Add(scrolledWindow, 1, wxEXPAND | wxRIGHT, 8);
return;
}
wxClientDC dc(parent);
wxSize msg_sz = dc.GetMultiLineTextExtent(msg);
page_size = wxSize(std::min(msg_sz.GetX(), info_width), std::min(msg_sz.GetY(), info_width));
}
html->SetMinSize(page_size);