From 86f07245d465d979c27c9009243009cceee5bf8e Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Tue, 11 Mar 2014 13:18:26 -0700 Subject: [PATCH] Fixed: CPRoundRectBezelStyle gives a CPNull ThemeState Previously with the CPRoundRectBezelStyle we got a CPNull themeState. Now we get an instance of ThemeState with the theme CPButtonStateBezelStyleRoundRect. CPButtonStateBezelStyleRoundRect is equal to CPThemeState("roundRect"). --- AppKit/CPButton.j | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j index d4deab55b..bad76448c 100644 --- a/AppKit/CPButton.j +++ b/AppKit/CPButton.j @@ -72,13 +72,14 @@ CPPushInCellMask = CPPushInButtonMask; CPChangeGrayCellMask = CPGrayButtonMask; CPChangeBackgroundCellMask = CPBackgroundButtonMask; -CPButtonStateMixed = CPThemeState("mixed"); -CPButtonStateBezelStyleRounded = CPThemeState("rounded"); +CPButtonStateMixed = CPThemeState("mixed"); +CPButtonStateBezelStyleRounded = CPThemeState("rounded"); +CPButtonStateBezelStyleRoundRect = CPThemeState("roundRect"); // add all future correspondance between bezel styles and theme state here. var CPButtonBezelStyleStateMap = @{ CPRoundedBezelStyle: CPButtonStateBezelStyleRounded, - CPRoundRectBezelStyle: [CPNull null], + CPRoundRectBezelStyle: CPButtonStateBezelStyleRoundRect, }; /// @cond IGNORE