amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX: [STUDIO-1486] set drawsBackground false for NSTextField

Browse source 
Change-Id: I46d6a2812d27e30cf56c037e33bb97d3d063a5b5
This commit is contained in:
chunmao.guo 2022-11-30 17:55:30 +08:00 committed by Lane.Wei
parent b60cabef28
commit 11ea1e36ea
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/Plater.cpp
View file

@ -1163,7 +1163,6 @@ void Sidebar::msw_rescale()
void Sidebar::sys_color_changed() void Sidebar::sys_color_changed()
{ {
#ifdef _WIN32
wxWindowUpdateLocker noUpdates(this); wxWindowUpdateLocker noUpdates(this);
#if 0 #if 0
@ -1192,7 +1191,6 @@ void Sidebar::sys_color_changed()
p->frequently_changed_parameters->sys_color_changed(); p->frequently_changed_parameters->sys_color_changed();
#endif #endif
p->object_settings->sys_color_changed(); p->object_settings->sys_color_changed();
#endif
//BBS: remove print related combos //BBS: remove print related combos
#if 0 #if 0

22
src/slic3r/Utils/MacDarkMode.mm
View file

@ -104,7 +104,7 @@ void openFolderForFile(wxString const & file)
@end @end
/* textColor for NSTextField */ /* textColor for NSTextField */
@implementation NSTextField (NSTextField_Extended) @implementation NSTextField (textColor)
- (void)setTextColor2:(NSColor *)textColor - (void)setTextColor2:(NSColor *)textColor
{ {
@ -129,6 +129,26 @@ void openFolderForFile(wxString const & file)
@end @end
/* drawsBackground for NSTextField */
@implementation NSTextField (drawsBackground)
- (instancetype)initWithFrame2:(NSRect)frameRect
{
[self initWithFrame2:frameRect];
self.drawsBackground = false;
return self;
}
+ (void) load
{
Method initWithFrame = class_getInstanceMethod([NSTextField class], @selector(initWithFrame:));
Method initWithFrame2 = class_getInstanceMethod([NSTextField class], @selector(initWithFrame2:));
method_exchangeImplementations(initWithFrame, initWithFrame2);
}
@end
/* textColor for NSButton */ /* textColor for NSButton */
@implementation NSButton (NSButton_Extended) @implementation NSButton (NSButton_Extended)