Implemented controls setup view groups (still has some quirks).

Annovae · Jul 30, 2013 · 1af3c30 · 1af3c30
1 parent b7b9cff
commit 1af3c30
Show file tree

Hide file tree

Showing 9 changed files with 592 additions and 204 deletions.
diff --git a/Interface Graphics/Preferences/controls_triangle.png b/Interface Graphics/Preferences/controls_triangle.png
diff --git a/Interface Graphics/Theme.plist b/Interface Graphics/Theme.plist
@@ -1298,6 +1298,20 @@
 				<string>{{42,0},{21,21}}</string>
 			</dict>
 		</dict>
+		<key>controls_triangle</key>
+		<dict>
+			<key>Resource</key>
+			<string>controls_triangle</string>
+			<key>States</key>
+			<dict>
+				<key>Default</key>
+				<string>{{0,0},{10,10}}</string>
+				<key>Toggle Off</key>
+				<string>{{0,0},{10,10}}</string>
+				<key>Toggle On</key>
+				<string>{{0,10},{10,10}}</string>
+			</dict>
+		</dict>
 		<key>game_scanner_toggle_pause_cancel</key>
 		<dict>
 			<key>Resource</key>

diff --git a/OpenEmu/OEBackgroundImageView.m b/OpenEmu/OEBackgroundImageView.m
@@ -43,13 +43,13 @@ - (id)initWithThemeKey:(NSString*)themeKey
 
 - (void)drawRect:(NSRect)dirtyRect
 {
-    NSRect       targetRect   = [self bounds];
     OEThemeState currentState = [self OE_currentState];
 
-    [[[self backgroundThemeImage] imageForState:currentState] drawInRect:targetRect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0 respectFlipped:[self isFlipped] hints:nil];
-    [[[self themeImage] imageForState:currentState] drawInRect:targetRect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0 respectFlipped:[self isFlipped] hints:nil];
-    [[self image] drawInRect:targetRect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0 respectFlipped:[self isFlipped] hints:nil];
+    [[[self backgroundThemeImage] imageForState:currentState] drawInRect:dirtyRect fromRect:dirtyRect operation:NSCompositeSourceOver fraction:1.0 respectFlipped:[self isFlipped] hints:nil];
+    [[[self themeImage] imageForState:currentState] drawInRect:dirtyRect fromRect:dirtyRect operation:NSCompositeSourceOver fraction:1.0 respectFlipped:[self isFlipped] hints:nil];
+    [[self image] drawInRect:dirtyRect fromRect:dirtyRect operation:NSCompositeSourceOver fraction:1.0 respectFlipped:[self isFlipped] hints:nil];
 }
+
 #pragma mark - Theme
 - (void)setThemeKey:(NSString *)key
 {

diff --git a/OpenEmu/OEControlsButtonSetupView.h b/OpenEmu/OEControlsButtonSetupView.h
@@ -26,6 +26,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+extern NSString * const OEControlsButtonHighlightRollsOver;
 @interface OEControlsButtonSetupView : NSView
 
 @property(unsafe_unretained) id  target;
@@ -43,6 +44,6 @@
 - (void)selectNextKeyButton;
 - (void)selectNextKeyAfterKeys:(NSArray *)keys;
 
-- (void)layoutSubviews;
+- (void)layoutSubviews:(BOOL)animated;
 
 @end