3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force canvas resize when switching between views

Browse Source
This commit is contained in:
Enrico Turri 2019-03-05 10:54:03 +01:00
parent de06db7989
commit 2c99fd35d3
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -5137,11 +5137,13 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
auto *top_level_wnd = dynamic_cast<wxTopLevelWindow*>(p); auto *top_level_wnd = dynamic_cast<wxTopLevelWindow*>(p);
if (top_level_wnd && top_level_wnd->IsActive()) if (top_level_wnd && top_level_wnd->IsActive())
m_canvas->SetFocus(); m_canvas->SetFocus();
// forces a frame render to ensure that m_hover_volume_id is updated even when the user right clicks while m_mouse.position = pos.cast<double>();
// 1) forces a frame render to ensure that m_hover_volume_id is updated even when the user right clicks while
// the context menu is shown, ensuring it to disappear if the mouse is outside any volume and to // the context menu is shown, ensuring it to disappear if the mouse is outside any volume and to
// change the volume hover state if any is under the mouse // change the volume hover state if any is under the mouse
m_mouse.position = pos.cast<double>(); // 2) when switching between 3d view and preview the size of the canvas changes if the side panels are visible,
render(); // so forces a resize to avoid multiple renders with different sizes (seen as flickering)
_refresh_if_shown_on_screen();
} }
m_mouse.set_start_position_2D_as_invalid(); m_mouse.set_start_position_2D_as_invalid();
//#endif //#endif

2
src/slic3r/GUI/GLTexture.cpp
View File

@ -165,7 +165,7 @@ bool GLTexture::load_from_svg_files_as_sprites_array(const std::vector<std::stri
} }
int state_offset_px = sprite_offset_px + state_id * sprite_size_px; int state_offset_px = sprite_offset_px + state_id * sprite_size_px;
for (int j = 0; j < sprite_size_px; ++j) for (int j = 0; j < (int)sprite_size_px; ++j)
{ {
::memcpy((void*)&data.data()[(state_offset_px + j * m_width) * 4], (const void*)&output_data.data()[j * sprite_stride], sprite_stride); ::memcpy((void*)&data.data()[(state_offset_px + j * m_width) * 4], (const void*)&output_data.data()[j * sprite_stride], sprite_stride);
} }

4
src/slic3r/GUI/Plater.cpp
View File

@ -1014,8 +1014,8 @@ struct Plater::priv
Slic3r::GCodePreviewData gcode_preview_data; Slic3r::GCodePreviewData gcode_preview_data;
// GUI elements // GUI elements
wxSizer* panel_sizer; wxSizer* panel_sizer{ nullptr };
wxPanel* current_panel; wxPanel* current_panel{ nullptr };
std::vector<wxPanel*> panels; std::vector<wxPanel*> panels;
Sidebar *sidebar; Sidebar *sidebar;
Bed3D bed; Bed3D bed;