Changeset 15034

Timestamp:

01/22/2006 01:49:00 AM (3 years ago)

Author:

evands

Message:

Patch from poisonousinsect which allows selection of transparency for custom message style background colors and allows styles to use a DefaultBackgroundIsTransparent key to declare their backgrounds as transparent. Thanks :)

I also fixed a control dimming issue with the custom background controls in the Message preferences.

Closes #131

Files:

• trunk/Plugins/Dual Window Interface/AIMessageViewController.m (modified) (1 diff)
• trunk/Plugins/Dual Window Interface/AIMessageWindowController.m (modified) (2 diffs)
• trunk/Plugins/WebKit Message View/AIWebKitMessageViewController.m (modified) (2 diffs)
• trunk/Plugins/WebKit Message View/AIWebkitMessageViewStyle.h (modified) (2 diffs)
• trunk/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m (modified) (3 diffs)
• trunk/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m (modified) (4 diffs)
• trunk/Plugins/WebKit Message View/ESWebView.h (modified) (1 diff)
• trunk/Plugins/WebKit Message View/ESWebView.m (modified) (2 diffs)
• trunk/Plugins/WebKit Message View/WebKitMessageView.ldb (modified) (previous)

trunk/Plugins/Dual Window Interface/AIMessageViewController.m

@@ -273 +273 @@
-        [controllerView_messages setFrame:[scrollView_messages documentVisibleRect]];
-        [[customView_messages superview] replaceSubview:customView_messages with:controllerView_messages];
+
+        //This is what draws our transparent background
+        //Technically, it could be set in MessageView.nib, too
+        [scrollView_messages setBackgroundColor:[NSColor clearColor]];
+
-        [controllerView_messages setNextResponder:textView_outgoing];
-}

trunk/Plugins/Dual Window Interface/AIMessageWindowController.m

@@ -89 +89 @@
-                //Load our window
-                myWindow = [self window];
-
+
+
+
+
-                //Tab hiding suppression (used to force tab bars visible when a drag is occuring)
-                tabBarIsVisible = YES;
@@ -298 +301 @@
-        
-        [inTabViewItem setContainer:self];
-
+
-        if (!silent) [[adium interfaceController] chatDidOpen:[inTabViewItem chat]];
-}

trunk/Plugins/WebKit Message View/AIWebKitMessageViewController.m

@@ -336 +336 @@
-        [webView setDraggingDelegate:self];
-        [webView setMaintainsBackForwardList:NO];
-
+
-        if (!draggedTypes) {
-                draggedTypes = [[NSArray alloc] initWithObjects:
@@ -425 +425 @@
-                [messageStyle setCustomBackgroundColor:nil];
-        }
-
+
+
-        //Update webview font settings
-        NSString        *fontFamily = [prefDict objectForKey:[plugin styleSpecificKey:@"FontFamily" forStyle:activeStyle]];

trunk/Plugins/WebKit Message View/AIWebkitMessageViewStyle.h

@@ -58 +58 @@
-        //Style settings
-        BOOL                            allowsCustomBackground;
+        BOOL                            transparentDefaultBackground;
-        BOOL                            allowsUserIcons;
-        BOOL                            usingCustomBaseHTML;
@@ -89 +90 @@
-//Settings
-- (BOOL)allowsCustomBackground;
+- (BOOL)isBackgroundTransparent;
-- (NSString *)defaultFontFamily;
-- (NSNumber *)defaultFontSize;

trunk/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m

@@ -92 +92 @@
-                //Style flags
-                allowsCustomBackground = ![[styleBundle objectForInfoDictionaryKey:@"DisableCustomBackground"] boolValue];
+                transparentDefaultBackground = [[styleBundle objectForInfoDictionaryKey:@"DefaultBackgroundIsTransparent"] boolValue];
+
-                combineConsecutive = ![[styleBundle objectForInfoDictionaryKey:@"DisableCombineConsecutive"] boolValue];
-
@@ -156 +158 @@
-{
-        return allowsCustomBackground;
+}
+
+/*!
+ * @breif Style has a transparent background
+ */
+- (BOOL)isBackgroundTransparent
+{
+        //Our custom background is only transparent if the user has set a custom color with an alpha component less than 1.0
+        return ((!customBackgroundColor && transparentDefaultBackground) ||
+                   (customBackgroundColor && [customBackgroundColor alphaComponent] < 0.99));
-}
-
@@ -1024 +1036 @@
-                                }
-                                if (customBackgroundColor) {
-
+
+
+
-                                }
-                        }

trunk/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m

@@ -108 +108 @@
-        //Observe preference changes and set our initial preferences
-        [[adium preferenceController] registerPreferenceObserver:self forGroup:PREF_GROUP_WEBKIT_MESSAGE_DISPLAY];
+        
+        //Allow the alpha component to be set for our background color
+        [[NSColorPanel sharedColorPanel] setShowsAlpha:YES];
+        
+        [self configureControlDimming];
-}
-
@@ -115 +120 @@
-- (void)viewWillClose
-{
+        //Hide the alpha component
+        [[NSColorPanel sharedColorPanel] setShowsAlpha:NO];
+        
-        [[adium notificationCenter] removeObserver:self];
-        [[adium preferenceController] unregisterPreferenceObserver:self];
@@ -256 +264 @@
-                                                                                                  group:PREF_GROUP_WEBKIT_MESSAGE_DISPLAY];
-                }
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -576 +594 @@
-                                                                                          message:message
-                                                                                        autoreply:[[messageDict objectForKey:@"Autoreply"] boolValue]];
-
+
-                        //AIContentMessage won't know whether the message is outgoing unless we tell it since neither our source
-                        //nor our destination are AIAccount objects.

trunk/Plugins/WebKit Message View/ESWebView.h

@@ -21 +21 @@
-        BOOL    allowsDragAndDrop;
-        BOOL    shouldForwardEvents;
+        BOOL    transparentBackground;
-}
+
+- (void)setDrawsBackground:(BOOL)flag;
+- (BOOL)drawsBackground;
-
-- (void)setFontFamily:(NSString *)familyName;

trunk/Plugins/WebKit Message View/ESWebView.m

@@ -17 +17 @@
-#import "ESWebView.h"
-
+@interface WebView (PRIVATE)
+- (void)setDrawsBackground:(BOOL)flag;
+- (BOOL)drawsBackground;
+@end
+
-@interface ESWebView (PRIVATE)
-- (void)forwardSelector:(SEL)selector withObject:(id)object;
@@ -25 +30 @@
-- (id)initWithFrame:(NSRect)frameRect frameName:(NSString *)frameName groupName:(NSString *)groupName
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
-        return self;
-}
+
+- (void)drawRect:(NSRect)rect
+{
+        [super drawRect:rect];
+        
+        //Only reset the shadow if we're transparent
+        if (transparentBackground) {
+                //This happens after the next run loop to ensure that we invalidate the shadow after all of our subviews have drawn
+                [[self window] performSelector:@selector(invalidateShadow)
+                                                        withObject:nil
+                                                        afterDelay:0
+                                                           inModes:[NSArray arrayWithObjects:NSDefaultRunLoopMode, NSEventTrackingRunLoopMode, nil]];
+        }
+}
+
+//Background Drawing ---------------------------------------------------------------------------------------------------
+#pragma mark Background Drawing
+- (void)setDrawsBackground:(BOOL)flag
+{
+        if ([super respondsToSelector:@selector(setDrawsBackground:)]) {
+                [super setDrawsBackground:flag];
+                transparentBackground = !flag;
+        }
+}
+- (BOOL)drawsBackground
+{
+        BOOL flag = YES;
+        if ([super respondsToSelector:@selector(drawsBackground)]) flag = [super drawsBackground];
+        return flag;
+}
+
-//Font Family ----------------------------------------------------------------------------------------------------------
-#pragma mark Font Family