Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-10 01:45:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 341974, Pop-up blocker's close button has no mouseover feedback. Patch by Aaron Schulman <aschulm@gmail.com>. r=smorgan, froodian. sr=pink

Browse Source
This commit is contained in:
nick.kreeger%park.edu 2006-08-13 18:39:14 +00:00
parent 4c92309d5d
commit b1973cffa2
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
camino/resources/localized/English.lproj/PopupBlockView.nib/classes.nib generated
View File

@ -9,11 +9,16 @@
}; };
CLASS = BrowserWrapper; CLASS = BrowserWrapper;
LANGUAGE = ObjC; LANGUAGE = ObjC;
OUTLETS = {mBlockedPopupView = NSView; mDelegate = id; }; OUTLETS = {
mBlockedPopupCloseButton = RolloverImageButton;
mBlockedPopupView = NSView;
mDelegate = id;
};
SUPERCLASS = NSView; SUPERCLASS = NSView;
}, },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = InformationPanel; LANGUAGE = ObjC; SUPERCLASS = NSView; } {CLASS = InformationPanel; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = RolloverImageButton; LANGUAGE = ObjC; SUPERCLASS = NSButton; }
); );
IBVersion = 1; IBVersion = 1;
} }

10
camino/resources/localized/English.lproj/PopupBlockView.nib/info.nib generated
View File

@ -3,15 +3,19 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>38 194 356 240 0 0 1920 1178 </string> <string>174 376 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>5</key> <key>5</key>
<string>655 769 645 72 0 0 1920 1178 </string> <string>342 482 645 72 0 0 1280 778 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>443.0</string> <string>443.0</string>
<key>IBOpenObjects</key>
<array>
<integer>5</integer>
</array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>8G32</string> <string>8I2025</string>
</dict> </dict>
</plist> </plist>

BIN
camino/resources/localized/English.lproj/PopupBlockView.nib/keyedobjects.nib generated
View File

Binary file not shown.

2
camino/src/browser/BrowserWrapper.h
View File

@ -41,6 +41,7 @@
@class BrowserWindowController; @class BrowserWindowController;
@class ToolTip; @class ToolTip;
@class AutoCompleteTextField; @class AutoCompleteTextField;
@class RolloverImageButton;
class nsIMutableArray; class nsIMutableArray;
class nsIArray; class nsIArray;
@ -149,6 +150,7 @@ class nsIArray;
ToolTip* mToolTip; ToolTip* mToolTip;
IBOutlet NSView* mBlockedPopupView; // loaded on demand, can be nil, STRONG IBOutlet NSView* mBlockedPopupView; // loaded on demand, can be nil, STRONG
IBOutlet RolloverImageButton* mBlockedPopupCloseButton;
double mProgress; double mProgress;

6
camino/src/browser/BrowserWrapper.mm
View File

@ -49,6 +49,7 @@
#import "PageProxyIcon.h" #import "PageProxyIcon.h"
#import "KeychainService.h" #import "KeychainService.h"
#import "AutoCompleteTextField.h" #import "AutoCompleteTextField.h"
#import "RolloverImageButton.h"
#include "CHBrowserService.h" #include "CHBrowserService.h"
#include "ContentClickListener.h" #include "ContentClickListener.h"
@ -506,6 +507,11 @@ static NSString* const kOfflineNotificationName = @"offlineModeChanged";
// current tab is eventually displayed. // current tab is eventually displayed.
if ([self popupsBlocked] && !mBlockedPopupView) { if ([self popupsBlocked] && !mBlockedPopupView) {
[NSBundle loadNibNamed:@"PopupBlockView" owner:self]; [NSBundle loadNibNamed:@"PopupBlockView" owner:self];
[mBlockedPopupCloseButton setImage:[NSImage imageNamed:@"tab_close"]];
[mBlockedPopupCloseButton setAlternateImage:[NSImage imageNamed:@"tab_close_pressed"]];
[mBlockedPopupCloseButton setHoverImage:[NSImage imageNamed:@"tab_close_hover"]];
[self addSubview:mBlockedPopupView]; [self addSubview:mBlockedPopupView];
[self setFrame:[self frame] resizingBrowserViewIfHidden:YES]; [self setFrame:[self frame] resizingBrowserViewIfHidden:YES];
[self display]; [self display];