public_mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-31 11:15:52 +00:00
Code Issues Activity

Fixed conflicts after merge with master

Browse Source
This commit is contained in:
enricoturri1966
2020-06-12 10:35:18 +02:00
parent aa14b42638 1c95ceaeaa
commit ab60499298
37 changed files with 1441 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/GUI_Utils.hpp
+1 -1
View File
@@ -341,7 +341,7 @@ public:
static WindowMetrics from_window(wxTopLevelWindow *window);
static boost::optional<WindowMetrics> deserialize(const std::string &str);
wxRect get_rect() const { return rect; }
const wxRect& get_rect() const { return rect; }
bool get_maximized() const { return maximized; }
void sanitize_for_display(const wxRect &screen_rect);