diff --git a/slic3r/GUI/GUI_App.cpp b/slic3r/GUI/GUI_App.cpp index f10a6a0..263cbd6 100644 --- a/slic3r/GUI/GUI_App.cpp +++ b/slic3r/GUI/GUI_App.cpp @@ -406,7 +406,7 @@ public: int logo_width = FromDIP(94 * m_scale); wxBitmap logo_bmp = *bmp_cache.load_svg("splash_logo", logo_size, logo_size); 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 int text_margin = FromDIP(80 * m_scale); @@ -459,7 +459,7 @@ public: // delete gc; //} //fangfa3 - wxBitmap bitmap(width, height,32); + /*wxBitmap bitmap(width, height,32); { wxMemoryDC dc(bitmap); dc.SetBackground(*wxTRANSPARENT_BRUSH); @@ -472,7 +472,7 @@ public: dc.SetPen(wxPen(wxColour(255, 0, 0, 128))); dc.SetBrush(wxBrush(wxColour(255, 0, 0, 128))); dc.DrawRectangle(0, 0, width, height); - } + }*/ /* wxBitmap mask(100, 100); wxMemoryDC maskDC(mask); @@ -483,7 +483,20 @@ public: maskDC.DrawRectangle(0, 0, width, height); 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; } @@ -2764,6 +2777,7 @@ bool GUI_App::on_init_inner() #ifndef __linux__ wxYield(); #endif + //scrn->SetBackgroundColour(wxColor(0,0,0,0)); scrn->SetText(_L("Loading configuration")+ dots); } diff --git a/slic3r/GUI/Plater.cpp b/slic3r/GUI/Plater.cpp index af7d987..3f18ed0 100644 --- a/slic3r/GUI/Plater.cpp +++ b/slic3r/GUI/Plater.cpp @@ -2931,7 +2931,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) //panel_sizer->Add(vsizer_status, 2, wxEXPAND | wxALL, 0); vsizer->Add(panel_sizer, 9, wxEXPAND | wxALL, 0); status_panel->SetBackgroundColour(wxColor(236, 246, 248)); - vsizer->Add(status_panel, 1, wxEXPAND | wxALL, 2); + vsizer->Add(status_panel, 1, wxEXPAND | wxALL, 0); //xiamian //hsizer->Add(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); wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL); sizer->AddStretchSpacer(20); - //sizer->InsertStretchSpacer(20); - //sizer->InsertSpacer(20); - //sizer->AddSpacer(20); sizer->AddSpacer(20); sizer->Add(staticText, 0, wxLEFT, 20); - //sizer->AddSpacer(20); - //sizer->AddStretchSpacer(5); s_panel->SetSizer(sizer); s_panel->Layout(); - 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); + //xiamian- + //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) diff --git a/slic3r/GUI/Tab.cpp b/slic3r/GUI/Tab.cpp index d6c8766..a1acfc2 100644 --- a/slic3r/GUI/Tab.cpp +++ b/slic3r/GUI/Tab.cpp @@ -4301,8 +4301,8 @@ void TabConfig::build() { } void TabConfig::reload_config() { - this->compatible_widget_reload(m_compatible_printers); - this->compatible_widget_reload(m_compatible_prints); + //this->compatible_widget_reload(m_compatible_printers); + //this->compatible_widget_reload(m_compatible_prints); Tab::reload_config(); } void TabConfig::update_description_lines()