From 095dad51c91a0a24e4789a0e63c3b8b19137feed Mon Sep 17 00:00:00 2001 From: "Fraser J. Gordon" Date: Fri, 29 Jan 2016 15:16:01 +0000 Subject: [PATCH 1/2] Don't draw backgrounds for native-themed tab panes --- engine/src/buttondraw.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/src/buttondraw.cpp b/engine/src/buttondraw.cpp index 6b8796ec694..183050a5e79 100644 --- a/engine/src/buttondraw.cpp +++ b/engine/src/buttondraw.cpp @@ -186,8 +186,11 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool case F_RADIO: case F_RECTANGLE: case F_STANDARD: - if (MCcurtheme == NULL || !getstack() -> ismetal() || (isstdbtn && state & CS_HILITED) || - !MCcurtheme -> drawmetalbackground(dc, dirty, trect, this)) + if ((isstdbtn && (state & CS_HILITED)) + || MCcurtheme == NULL + || !((getstack()->ismetal() && MCcurtheme->drawmetalbackground(dc, dirty, trect, this)) + || (style == F_MENU && menumode == WM_TOP_LEVEL && MCcurtheme->iswidgetsupported(WTHEME_TYPE_TABPANE)))) + { if (isstdbtn && noback) { From 2dd841f012e8a334d047d6292a9c49e71bb77bd0 Mon Sep 17 00:00:00 2001 From: "Fraser J. Gordon" Date: Fri, 29 Jan 2016 15:16:57 +0000 Subject: [PATCH 2/2] [[ Bugfix 14361 ]] Add bugfix note --- docs/notes/bugfix-14361.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/notes/bugfix-14361.md diff --git a/docs/notes/bugfix-14361.md b/docs/notes/bugfix-14361.md new file mode 100644 index 00000000000..cbad6bdd8db --- /dev/null +++ b/docs/notes/bugfix-14361.md @@ -0,0 +1 @@ +# Ignore the background color for native-appearance tab panes