caojiawei
/
BambuStudio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页弹窗透明化尝试。底框信息栏优化。

This commit is contained in:
cjw 2025-01-22 16:01:06 +08:00
parent b1364bae2a
commit 4d346ba4b7
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
slic3r/GUI/GUI_App.cpp
View File

@ -406,7 +406,7 @@ public:
int logo_width = FromDIP(94 * m_scale); int logo_width = FromDIP(94 * m_scale);
wxBitmap logo_bmp = *bmp_cache.load_svg("splash_logo", logo_size, logo_size); wxBitmap logo_bmp = *bmp_cache.load_svg("splash_logo", logo_size, logo_size);
int logo_y = top_margin + title_rect.GetHeight() + logo_margin; int logo_y = top_margin + title_rect.GetHeight() + logo_margin;
memDc.DrawBitmap(logo_bmp, 900, -100, true); memDc.DrawBitmap(logo_bmp, 900, 0, true);
// calculate position for the dynamic text // calculate position for the dynamic text
int text_margin = FromDIP(80 * m_scale); int text_margin = FromDIP(80 * m_scale);
@ -459,7 +459,7 @@ public:
// delete gc; // delete gc;
//} //}
//fangfa3 //fangfa3
wxBitmap bitmap(width, height,32); /*wxBitmap bitmap(width, height,32);
{ {
wxMemoryDC dc(bitmap); wxMemoryDC dc(bitmap);
dc.SetBackground(*wxTRANSPARENT_BRUSH); dc.SetBackground(*wxTRANSPARENT_BRUSH);
@ -472,7 +472,7 @@ public:
dc.SetPen(wxPen(wxColour(255, 0, 0, 128))); dc.SetPen(wxPen(wxColour(255, 0, 0, 128)));
dc.SetBrush(wxBrush(wxColour(255, 0, 0, 128))); dc.SetBrush(wxBrush(wxColour(255, 0, 0, 128)));
dc.DrawRectangle(0, 0, width, height); dc.DrawRectangle(0, 0, width, height);
} }*/
/* wxBitmap mask(100, 100); /* wxBitmap mask(100, 100);
wxMemoryDC maskDC(mask); wxMemoryDC maskDC(mask);
@ -483,7 +483,20 @@ public:
maskDC.DrawRectangle(0, 0, width, height); maskDC.DrawRectangle(0, 0, width, height);
bitmap.SetMask(new wxMask(mask, wxColour(0, 0, 0)));*/ bitmap.SetMask(new wxMask(mask, wxColour(0, 0, 0)));*/
wxBitmap bitmap(width, height, 24);
wxMemoryDC memDC;
memDC.SelectObject(bitmap);
memDC.SetBackground(*wxWHITE_BRUSH);
memDC.Clear();
wxImage image = bitmap.ConvertToImage();
image.SetMask(true);
image.SetMaskColour(255,255,255);
bitmap = wxBitmap(image);
return bitmap; return bitmap;
} }
@ -2764,6 +2777,7 @@ bool GUI_App::on_init_inner()
#ifndef __linux__ #ifndef __linux__
wxYield(); wxYield();
#endif #endif
//scrn->SetBackgroundColour(wxColor(0,0,0,0));
scrn->SetText(_L("Loading configuration")+ dots); scrn->SetText(_L("Loading configuration")+ dots);
} }

12
slic3r/GUI/Plater.cpp
View File

@ -2931,7 +2931,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
//panel_sizer->Add(vsizer_status, 2, wxEXPAND | wxALL, 0); //panel_sizer->Add(vsizer_status, 2, wxEXPAND | wxALL, 0);
vsizer->Add(panel_sizer, 9, wxEXPAND | wxALL, 0); vsizer->Add(panel_sizer, 9, wxEXPAND | wxALL, 0);
status_panel->SetBackgroundColour(wxColor(236, 246, 248)); status_panel->SetBackgroundColour(wxColor(236, 246, 248));
vsizer->Add(status_panel, 1, wxEXPAND | wxALL, 2); vsizer->Add(status_panel, 1, wxEXPAND | wxALL, 0);
//xiamian //xiamian
//hsizer->Add(vsizer, 1, wxEXPAND | wxALL, 0); //hsizer->Add(vsizer, 1, wxEXPAND | wxALL, 0);
hsizer->Insert(0, vsizer, 1, wxEXPAND | wxALL, 0); hsizer->Insert(0, vsizer, 1, wxEXPAND | wxALL, 0);
@ -13763,17 +13763,13 @@ void Plater::show_object_info()
auto staticText = new wxStaticText(s_panel, wxID_ANY, wxString::FromUTF8(info_text), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT); auto staticText = new wxStaticText(s_panel, wxID_ANY, wxString::FromUTF8(info_text), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
sizer->AddStretchSpacer(20); sizer->AddStretchSpacer(20);
//sizer->InsertStretchSpacer(20);
//sizer->InsertSpacer(20);
//sizer->AddSpacer(20);
sizer->AddSpacer(20); sizer->AddSpacer(20);
sizer->Add(staticText, 0, wxLEFT, 20); sizer->Add(staticText, 0, wxLEFT, 20);
//sizer->AddSpacer(20);
//sizer->AddStretchSpacer(5);
s_panel->SetSizer(sizer); s_panel->SetSizer(sizer);
s_panel->Layout(); s_panel->Layout();
info_text += into_u8(info_manifold); //xiamian-
notify_manager->bbl_show_objectsinfo_notification(info_text, warning, !(p->current_panel == p->view3D), into_u8(hyper_text), callback); //info_text += into_u8(info_manifold);
//notify_manager->bbl_show_objectsinfo_notification(info_text, warning, !(p->current_panel == p->view3D), into_u8(hyper_text), callback);
} }
bool Plater::show_publish_dialog(bool show) bool Plater::show_publish_dialog(bool show)

4
slic3r/GUI/Tab.cpp
View File

@ -4301,8 +4301,8 @@ void TabConfig::build() {
} }
void TabConfig::reload_config() void TabConfig::reload_config()
{ {
this->compatible_widget_reload(m_compatible_printers); //this->compatible_widget_reload(m_compatible_printers);
this->compatible_widget_reload(m_compatible_prints); //this->compatible_widget_reload(m_compatible_prints);
Tab::reload_config(); Tab::reload_config();
} }
void TabConfig::update_description_lines() void TabConfig::update_description_lines()