3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixes second part of #4282 (wxWidgets 3.0 compatibility)

Browse source
This commit is contained in:
Lukas Matena 2020-05-27 17:30:35 +02:00
parent c6f0cd5b5b
commit 6d432f5426
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/slic3r/GUI/Search.cpp
View file

@ -28,6 +28,12 @@ using GUI::into_u8;
namespace Search { namespace Search {
// Does our wxWidgets version support markup?
// https://github.com/prusa3d/PrusaSlicer/issues/4282#issuecomment-634676371
#if wxUSE_MARKUP && wxCHECK_VERSION(3, 1, 1)
#define SEARCH_SUPPORTS_MARKUP
#endif
static const std::vector<std::wstring>& NameByType() static const std::vector<std::wstring>& NameByType()
{ {
static std::vector<std::wstring> data; static std::vector<std::wstring> data;
@ -271,8 +277,14 @@ bool OptionsSearcher::search(const std::string& search, bool force/* = false*/)
label += L" [" + std::to_wstring(score) + L"]";// add score value label += L" [" + std::to_wstring(score) + L"]";// add score value
std::string label_u8 = into_u8(label); std::string label_u8 = into_u8(label);
std::string label_plain = label_u8; std::string label_plain = label_u8;
boost::replace_all(label_plain, std::string(1, char(ImGui::ColorMarkerStart)), "<b>");
boost::replace_all(label_plain, std::string(1, char(ImGui::ColorMarkerEnd)), "</b>"); #ifdef SEARCH_SUPPORTS_MARKUP
boost::replace_all(label_plain, std::string(1, char(ImGui::ColorMarkerStart)), "<b>");
boost::replace_all(label_plain, std::string(1, char(ImGui::ColorMarkerEnd)), "</b>");
#else
boost::erase_all(label_plain, std::string(1, char(ImGui::ColorMarkerStart)));
boost::erase_all(label_plain, std::string(1, char(ImGui::ColorMarkerEnd)));
#endif
found.emplace_back(FoundOption{ label_plain, label_u8, boost::nowide::narrow(get_tooltip(opt)), i, score }); found.emplace_back(FoundOption{ label_plain, label_u8, boost::nowide::narrow(get_tooltip(opt)), i, score });
} }
} }
@ -443,9 +455,11 @@ SearchDialog::SearchDialog(OptionsSearcher* searcher)
search_list->AppendBitmapColumn("", SearchListModel::colIcon); search_list->AppendBitmapColumn("", SearchListModel::colIcon);
wxDataViewTextRenderer* const markupRenderer = new wxDataViewTextRenderer(); wxDataViewTextRenderer* const markupRenderer = new wxDataViewTextRenderer();
#if wxUSE_MARKUP
#ifdef SEARCH_SUPPORTS_MARKUP
markupRenderer->EnableMarkup(); markupRenderer->EnableMarkup();
#endif // wxUSE_MARKUP #endif
search_list->AppendColumn(new wxDataViewColumn("", markupRenderer, SearchListModel::colMarkedText, wxCOL_WIDTH_AUTOSIZE, wxALIGN_LEFT)); search_list->AppendColumn(new wxDataViewColumn("", markupRenderer, SearchListModel::colMarkedText, wxCOL_WIDTH_AUTOSIZE, wxALIGN_LEFT));
search_list->GetColumn(SearchListModel::colIcon )->SetWidth(3 * em_unit()); search_list->GetColumn(SearchListModel::colIcon )->SetWidth(3 * em_unit());