3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-05 16:51:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

include patch from #2926

Browse source
This commit is contained in:
Ocraftyone 2023-11-30 03:28:02 -05:00
parent cfc67dd411
commit 4308fad525
No known key found for this signature in database
GPG key ID: 85836ED21AD4D125
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
deps/wxWidgets/0001-patch-v3.2.1-for-OrcaSlicer.patch vendored
View file

@ -1,6 +1,6 @@
From c0d9541c8c2d729dd7c439a16ae34ffd7f292abc Mon Sep 17 00:00:00 2001 From 7eafe511eb7b1a234c5b956b45deb4865db75733 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com> From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Sat, 4 Nov 2023 06:40:22 -0400 Date: Thu, 30 Nov 2023 03:25:54 -0500
Subject: [PATCH] patch v3.2.1 for OrcaSlicer Subject: [PATCH] patch v3.2.1 for OrcaSlicer
--- ---
@ -15,6 +15,7 @@ Subject: [PATCH] patch v3.2.1 for OrcaSlicer
src/common/datavcmn.cpp | 6 ++- src/common/datavcmn.cpp | 6 ++-
src/common/dcbufcmn.cpp | 6 +++ src/common/dcbufcmn.cpp | 6 +++
src/common/gdicmn.cpp | 14 +++++++ src/common/gdicmn.cpp | 14 +++++++
src/common/image.cpp | 6 +--
src/generic/grid.cpp | 50 ++++++++++++++++++++----- src/generic/grid.cpp | 50 ++++++++++++++++++++-----
src/msw/bmpcbox.cpp | 9 ++++- src/msw/bmpcbox.cpp | 9 ++++-
src/msw/font.cpp | 14 +++---- src/msw/font.cpp | 14 +++----
@ -22,7 +23,7 @@ Subject: [PATCH] patch v3.2.1 for OrcaSlicer
src/msw/window.cpp | 52 +++++++++++++++++--------- src/msw/window.cpp | 52 +++++++++++++++++---------
src/osx/cocoa/dataview.mm | 26 +++++++++++-- src/osx/cocoa/dataview.mm | 26 +++++++++++--
src/osx/cocoa/settings.mm | 6 +-- src/osx/cocoa/settings.mm | 6 +--
18 files changed, 177 insertions(+), 53 deletions(-) 19 files changed, 180 insertions(+), 56 deletions(-)
diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
index 085381d785..62146abc04 100644 index 085381d785..62146abc04 100644
@ -257,6 +258,25 @@ index db8a01f961..162c1ce2dc 100644
void wxClientDisplayRect(int *x, int *y, int *width, int *height) void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{ {
const wxRect rect = wxGetClientDisplayRect(); const wxRect rect = wxGetClientDisplayRect();
diff --git a/src/common/image.cpp b/src/common/image.cpp
index 19fe34ec91..a449b60930 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -390,11 +390,11 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
unsigned char red = pixel[0] ;
unsigned char green = pixel[1] ;
unsigned char blue = pixel[2] ;
- unsigned char alpha = 255 ;
- if ( source_alpha )
- alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue )
{
+ unsigned char alpha = 255 ;
+ if ( source_alpha )
+ alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
if ( alpha > 0 )
{
avgRed += red ;
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index ed3d988994..d71cda122d 100644 index ed3d988994..d71cda122d 100644
--- a/src/generic/grid.cpp --- a/src/generic/grid.cpp
@ -554,7 +574,7 @@ index c529a4fa3b..7e547c64df 100644
return ::GetSystemMetrics(nIndex); return ::GetSystemMetrics(nIndex);
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index f188e61089..3d3159ce9d 100644 index f188e61089..7b867002d1 100644
--- a/src/osx/cocoa/dataview.mm --- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm
@@ -1604,6 +1604,15 @@ outlineView:(NSOutlineView*)outlineView @@ -1604,6 +1604,15 @@ outlineView:(NSOutlineView*)outlineView