Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/78cbfa34b5f714349ce97a8b0e714f257039836b
...commit
http://git.netsurf-browser.org/netsurf.git/commit/78cbfa34b5f714349ce97a8b0e714f257039836b
...tree
http://git.netsurf-browser.org/netsurf.git/tree/78cbfa34b5f714349ce97a8b0e714f257039836b
The branch, svenw/cocoa has been updated
via 78cbfa34b5f714349ce97a8b0e714f257039836b (commit)
via c3b7482ce67c7c408bc028b139b651f8b8118ca6 (commit)
from 246326c5b4b926f23c69a6cbf988769b85c9ef98 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=78cbfa34b5f714349ce97a8b0e714f257039836b
commit 78cbfa34b5f714349ce97a8b0e714f257039836b
Author: Sven Weidauer <[email protected]>
Commit: Sven Weidauer <[email protected]>
Remove black scroller and replace with regular ones.
diff --git a/frontends/cocoa/BlackScroller.h b/frontends/cocoa/BlackScroller.h
deleted file mode 100644
index 3efe662..0000000
--- a/frontends/cocoa/BlackScroller.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright (c) 1011 Sven Weidauer
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. */
-
-#import <Cocoa/Cocoa.h>
-
-@interface BlackScroller : NSScroller {
- BOOL drawTrack;
- NSTrackingRectTag tag;
-}
-
-@property (readonly, getter=isHorizontal) BOOL horizontal;
-
-@end
diff --git a/frontends/cocoa/BlackScroller.m b/frontends/cocoa/BlackScroller.m
deleted file mode 100644
index df15e91..0000000
--- a/frontends/cocoa/BlackScroller.m
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright (c) 1011 Sven Weidauer
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#import "BlackScroller.h"
-
-@implementation BlackScroller
-
-- (void)setFrame:(NSRect)frameRect
-{
- [super setFrame:frameRect];
- if (tag != 0)
- [self removeTrackingRect:tag];
- tag = [self addTrackingRect:[self bounds] owner:self userData:NULL
assumeInside:NO];
-}
-
-- (void)drawRect:(NSRect)dirtyRect
-{
- [[NSColor clearColor] set];
- [NSBezierPath fillRect:dirtyRect];
-
- if (drawTrack)
- [self drawKnobSlotInRect:[self rectForPart:NSScrollerKnobSlot]
- highlight:NO];
- [self drawKnob];
-}
-
-- (void)drawKnobSlotInRect:(NSRect)slotRect highlight:(BOOL)flag
-{
- slotRect = NSInsetRect(slotRect, 2, 2);
- slotRect = [self.window convertRectToScreen:slotRect];
- slotRect.origin.x = floor(slotRect.origin.x) + 0.5;
- slotRect.origin.y = floor(slotRect.origin.y) + 0.5;
- slotRect.size.width = floor(slotRect.size.width);
- slotRect.size.height = floor(slotRect.size.height);
- slotRect = [self.window convertRectFromScreen:slotRect];
-
- NSGradient *gradient = [[NSGradient alloc] initWithColorsAndLocations:
- [NSColor clearColor], 0.0,
- [NSColor clearColor], 0.4,
- [NSColor whiteColor], 1.0,
- nil];
- [[NSColor whiteColor] set];
- const float radius = 0.5 * ([self isHorizontal] ? NSHeight(slotRect) :
NSWidth(slotRect));
- NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:slotRect
- xRadius:radius
- yRadius:radius];
- [gradient drawInBezierPath:path angle:[self isHorizontal] ? 90 : 0];
-
- [path stroke];
-}
-
-- (NSUsableScrollerParts)usableParts
-{
- return NSScrollerKnob | NSScrollerKnobSlot;
-}
-
-- (void)drawKnob
-{
- NSRect rect = NSInsetRect([self rectForPart:NSScrollerKnob], 2, 2);
-
- rect = [self.window convertRectToScreen:rect];
- rect.origin.x = floor(rect.origin.x) + 0.5;
- rect.origin.y = floor(rect.origin.y) + 0.5;
- rect.size.width = floor(rect.size.width);
- rect.size.height = floor(rect.size.height);
- rect = [self.window convertRectFromScreen:rect];
-
- [[NSColor colorWithDeviceWhite:1.0 alpha:drawTrack ? 1.0 : 0.6] set];
-
- const float radius = 0.5 * ([self isHorizontal] ? NSHeight(rect) :
NSWidth(rect));
- NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:rect
- xRadius:radius
- yRadius:radius];
- [path fill];
- [path stroke];
-}
-
-- (NSRect)rectForPart:(NSScrollerPart)partCode
-{
- const bool horizontal = [self isHorizontal];
-
- NSRect rect = horizontal ? NSInsetRect([self bounds], 4, 0) :
NSInsetRect([self bounds], 0, 4);
-
- switch (partCode) {
- case NSScrollerKnobSlot:
- return rect;
-
- case NSScrollerKnob: {
- const CGFloat len = horizontal ? NSWidth(rect) : NSHeight(rect);
- CGFloat knobLen = [self knobProportion] * len;
- const CGFloat minKnobLen = horizontal ? NSHeight(rect) : NSWidth(rect);
- if (knobLen < minKnobLen)
- knobLen = minKnobLen;
-
- const CGFloat start = [self doubleValue] * (len - knobLen);
-
- if (horizontal) {
- rect.origin.x += start;
- rect.size.width = knobLen;
- } else {
- rect.origin.y += start;
- rect.size.height = knobLen;
- }
-
- return rect;
- }
-
- default:
- return [super rectForPart:partCode];
- }
-}
-
-- (BOOL)isOpaque
-{
- return NO;
-}
-
-- (BOOL)isHorizontal
-{
- NSRect bounds = [self bounds];
- return NSWidth(bounds) > NSHeight(bounds);
-}
-
-- (void)mouseEntered:(NSEvent *)theEvent
-{
- drawTrack = YES;
- [self setNeedsDisplay:YES];
-}
-
-- (void)mouseExited:(NSEvent *)theEvent
-{
- drawTrack = NO;
- [self setNeedsDisplay:YES];
-}
-
-@end
diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index 0febfbb..212ed04 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -97,7 +97,6 @@ S_FRONTEND := \
selection.m \
ArrowBox.m \
ArrowWindow.m \
- BlackScroller.m \
LocalHistoryController.m \
apple_image.m
diff --git a/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
index bc1bee7..b4475ec 100644
--- a/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
+++ b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
@@ -23,7 +23,6 @@
263A281D1EE40CCF005C52B9 /* ArrowBox.m in Sources */ = {isa =
PBXBuildFile; fileRef = 263A26831EE40BFC005C52B9 /* ArrowBox.m */; };
263A281E1EE40CCF005C52B9 /* ArrowWindow.m in Sources */ = {isa
= PBXBuildFile; fileRef = 263A26841EE40BFC005C52B9 /* ArrowWindow.m */; };
263A281F1EE40CCF005C52B9 /* bitmap.m in Sources */ = {isa =
PBXBuildFile; fileRef = 263A26851EE40BFC005C52B9 /* bitmap.m */; };
- 263A28201EE40CCF005C52B9 /* BlackScroller.m in Sources */ =
{isa = PBXBuildFile; fileRef = 263A26861EE40BFC005C52B9 /* BlackScroller.m */;
};
263A28211EE40CCF005C52B9 /* BookmarksController.m in Sources */
= {isa = PBXBuildFile; fileRef = 263A26871EE40BFC005C52B9 /*
BookmarksController.m */; };
263A28221EE40CCF005C52B9 /* BrowserView.m in Sources */ = {isa
= PBXBuildFile; fileRef = 263A26881EE40BFC005C52B9 /* BrowserView.m */; };
263A28231EE40CCF005C52B9 /* BrowserViewController.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 263A26891EE40BFC005C52B9 /*
BrowserViewController.m */; };
@@ -295,7 +294,6 @@
263A26621EE40BFC005C52B9 /* ArrowBox.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
ArrowBox.h; sourceTree = SOURCE_ROOT; };
263A26631EE40BFC005C52B9 /* ArrowWindow.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
ArrowWindow.h; sourceTree = SOURCE_ROOT; };
263A26641EE40BFC005C52B9 /* bitmap.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
bitmap.h; sourceTree = SOURCE_ROOT; };
- 263A26651EE40BFC005C52B9 /* BlackScroller.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BlackScroller.h; sourceTree = SOURCE_ROOT; };
263A26661EE40BFC005C52B9 /* BookmarksController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BookmarksController.h; sourceTree = SOURCE_ROOT; };
263A26671EE40BFC005C52B9 /* BrowserView.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BrowserView.h; sourceTree = SOURCE_ROOT; };
263A26681EE40BFC005C52B9 /* BrowserViewController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BrowserViewController.h; sourceTree = SOURCE_ROOT; };
@@ -328,7 +326,6 @@
263A26831EE40BFC005C52B9 /* ArrowBox.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= ArrowBox.m; sourceTree = SOURCE_ROOT; };
263A26841EE40BFC005C52B9 /* ArrowWindow.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= ArrowWindow.m; sourceTree = SOURCE_ROOT; };
263A26851EE40BFC005C52B9 /* bitmap.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= bitmap.m; sourceTree = SOURCE_ROOT; };
- 263A26861EE40BFC005C52B9 /* BlackScroller.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BlackScroller.m; sourceTree = SOURCE_ROOT; };
263A26871EE40BFC005C52B9 /* BookmarksController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BookmarksController.m; sourceTree = SOURCE_ROOT; };
263A26881EE40BFC005C52B9 /* BrowserView.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BrowserView.m; sourceTree = SOURCE_ROOT; };
263A26891EE40BFC005C52B9 /* BrowserViewController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BrowserViewController.m; sourceTree = SOURCE_ROOT; };
@@ -748,7 +745,6 @@
263A26621EE40BFC005C52B9 /* ArrowBox.h */,
263A26631EE40BFC005C52B9 /* ArrowWindow.h */,
263A26641EE40BFC005C52B9 /* bitmap.h */,
- 263A26651EE40BFC005C52B9 /* BlackScroller.h */,
263A26661EE40BFC005C52B9 /*
BookmarksController.h */,
263A26671EE40BFC005C52B9 /* BrowserView.h */,
263A26681EE40BFC005C52B9 /*
BrowserViewController.h */,
@@ -781,7 +777,6 @@
263A26831EE40BFC005C52B9 /* ArrowBox.m */,
263A26841EE40BFC005C52B9 /* ArrowWindow.m */,
263A26851EE40BFC005C52B9 /* bitmap.m */,
- 263A26861EE40BFC005C52B9 /* BlackScroller.m */,
263A26871EE40BFC005C52B9 /*
BookmarksController.m */,
263A26881EE40BFC005C52B9 /* BrowserView.m */,
263A26891EE40BFC005C52B9 /*
BrowserViewController.m */,
@@ -1723,7 +1718,6 @@
263A28171EE40CCF005C52B9 /*
PSMTabDragAssistant.m in Sources */,
263A287A1EE40CFB005C52B9 /* version.c in
Sources */,
263A28741EE40CFB005C52B9 /* selection.c in
Sources */,
- 263A28201EE40CCF005C52B9 /* BlackScroller.m in
Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/frontends/cocoa/res/LocalHistoryPanel.xib
b/frontends/cocoa/res/LocalHistoryPanel.xib
index 794d2db..5f2d688 100644
--- a/frontends/cocoa/res/LocalHistoryPanel.xib
+++ b/frontends/cocoa/res/LocalHistoryPanel.xib
@@ -1,357 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
- <object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
- <string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">804</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects"
id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomObject" id="1001">
- <string
key="NSClassName">LocalHistoryController</string>
- </object>
- <object class="NSCustomObject" id="1003">
- <string
key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="1004">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSWindowTemplate" id="1005">
- <int key="NSWindowStyleMask">15</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{196, 240}, {480,
270}}</string>
- <int key="NSWTFlags">1618477056</int>
- <string key="NSWindowTitle">Window</string>
- <string key="NSWindowClass">ArrowWindow</string>
- <nil key="NSViewClass"/>
- <string
key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
- <object class="NSView" key="NSWindowView"
id="1006">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <object class="NSMutableArray"
key="NSSubviews">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <object class="NSScrollView"
id="488267087">
- <reference
key="NSNextResponder" ref="1006"/>
- <int
key="NSvFlags">274</int>
- <object
class="NSMutableArray" key="NSSubviews">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <object
class="NSClipView" id="753770525">
-
<reference key="NSNextResponder" ref="488267087"/>
- <int
key="NSvFlags">2304</int>
- <object
class="NSMutableArray" key="NSSubviews">
-
<bool key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSCustomView" id="820702167">
-
<reference key="NSNextResponder" ref="753770525"/>
-
<int key="NSvFlags">256</int>
-
<string key="NSFrameSize">{480, 270}</string>
-
<reference key="NSSuperview" ref="753770525"/>
-
<string key="NSClassName">HistoryView</string>
-
</object>
-
</object>
- <string
key="NSFrame">{{1, 1}, {480, 270}}</string>
-
<reference key="NSSuperview" ref="488267087"/>
-
<reference key="NSNextKeyView" ref="820702167"/>
-
<reference key="NSDocView" ref="820702167"/>
- <object
class="NSColor" key="NSBGColor">
-
<int key="NSColorSpace">6</int>
-
<string key="NSCatalogName">System</string>
-
<string key="NSColorName">controlColor</string>
-
<object class="NSColor" key="NSColor">
-
<int key="NSColorSpace">3</int>
-
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-
</object>
-
</object>
- <int
key="NScvFlags">2</int>
- </object>
- <object
class="NSScroller" id="84195230">
-
<reference key="NSNextResponder" ref="488267087"/>
- <int
key="NSvFlags">-2147483392</int>
- <string
key="NSFrame">{{470, 1}, {11, 255}}</string>
-
<reference key="NSSuperview" ref="488267087"/>
- <int
key="NSsFlags">256</int>
- <int
key="NSArrowsLoc">2</int>
-
<reference key="NSTarget" ref="488267087"/>
- <string
key="NSAction">_doScroller:</string>
- <double
key="NSCurValue">1</double>
- <double
key="NSPercent">0.96363627910614014</double>
- </object>
- <object
class="NSScroller" id="645365106">
-
<reference key="NSNextResponder" ref="488267087"/>
- <int
key="NSvFlags">-2147483392</int>
- <string
key="NSFrame">{{1, 260}, {465, 11}}</string>
-
<reference key="NSSuperview" ref="488267087"/>
- <int
key="NSsFlags">257</int>
- <int
key="NSArrowsLoc">2</int>
-
<reference key="NSTarget" ref="488267087"/>
- <string
key="NSAction">_doScroller:</string>
- <double
key="NSPercent">0.50602412223815918</double>
- </object>
- </object>
- <string
key="NSFrame">{{-1, -1}, {482, 272}}</string>
- <reference
key="NSSuperview" ref="1006"/>
- <reference
key="NSNextKeyView" ref="753770525"/>
- <int
key="NSsFlags">562</int>
- <reference
key="NSVScroller" ref="84195230"/>
- <reference
key="NSHScroller" ref="645365106"/>
- <reference
key="NSContentView" ref="753770525"/>
- </object>
- </object>
- <string key="NSFrameSize">{480,
270}</string>
- <reference key="NSSuperview"/>
- </object>
- <string key="NSScreenRect">{{0, 0}, {1680,
1028}}</string>
- <string key="NSMaxSize">{1.79769e+308,
1.79769e+308}</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection"
key="connection">
- <string
key="label">window</string>
- <reference key="source"
ref="1001"/>
- <reference key="destination"
ref="1005"/>
- </object>
- <int key="connectionID">7</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection"
key="connection">
- <string
key="label">history</string>
- <reference key="source"
ref="1001"/>
- <reference key="destination"
ref="820702167"/>
- </object>
- <int key="connectionID">8</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object"
ref="0"/>
- <reference key="children"
ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object"
ref="1001"/>
- <reference key="parent"
ref="0"/>
- <string key="objectName">File's
Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object"
ref="1003"/>
- <reference key="parent"
ref="0"/>
- <string key="objectName">First
Responder</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-3</int>
- <reference key="object"
ref="1004"/>
- <reference key="parent"
ref="0"/>
- <string
key="objectName">Application</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object"
ref="1005"/>
- <object class="NSMutableArray"
key="children">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1006"/>
- </object>
- <reference key="parent"
ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object"
ref="1006"/>
- <object class="NSMutableArray"
key="children">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <reference
ref="488267087"/>
- </object>
- <reference key="parent"
ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3</int>
- <reference key="object"
ref="488267087"/>
- <object class="NSMutableArray"
key="children">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <reference
ref="84195230"/>
- <reference
ref="645365106"/>
- <reference
ref="820702167"/>
- </object>
- <reference key="parent"
ref="1006"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4</int>
- <reference key="object"
ref="84195230"/>
- <reference key="parent"
ref="488267087"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object"
ref="645365106"/>
- <reference key="parent"
ref="488267087"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6</int>
- <reference key="object"
ref="820702167"/>
- <reference key="parent"
ref="488267087"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary"
key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool
key="EncodedWithXMLCoder">YES</bool>
-
<string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
-
<string>1.IBWindowTemplateEditedContentRect</string>
-
<string>1.NSWindowTemplate.visibleAtLaunch</string>
- <string>1.WindowOrigin</string>
-
<string>1.editorWindowContentRectSynchronizationRect</string>
- <string>2.IBPluginDependency</string>
- <string>3.IBPluginDependency</string>
-
<string>3.IBViewBoundsToFrameTransform</string>
- <string>4.CustomClassName</string>
- <string>4.IBPluginDependency</string>
- <string>5.CustomClassName</string>
- <string>5.IBPluginDependency</string>
- <string>6.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray"
key="dict.values">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <string>{{364, 310}, {480,
270}}</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{364, 310}, {480,
270}}</string>
- <boolean value="NO"/>
- <string>{196, 240}</string>
- <string>{{202, 428}, {480,
270}}</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSAffineTransform">
- <bytes
key="NSTransformStruct">P4AAAL+AAAC/gAAAw4aAAA</bytes>
- </object>
- <string>BlackScroller</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>BlackScroller</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary"
key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray"
key="dict.values">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray"
key="dict.values">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">8</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray"
key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string
key="className">ArrowWindow</string>
- <string
key="superclassName">NSWindow</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">ArrowWindow.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">BlackScroller</string>
- <string
key="superclassName">NSScroller</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">BlackScroller.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">HistoryView</string>
- <string
key="superclassName">NSView</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">HistoryView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">LocalHistoryController</string>
- <string
key="superclassName">NSWindowController</string>
- <object class="NSMutableDictionary"
key="outlets">
- <string
key="NS.key.0">history</string>
- <string
key="NS.object.0">HistoryView</string>
- </object>
- <object class="NSMutableDictionary"
key="toOneOutletInfosByName">
- <string
key="NS.key.0">history</string>
- <object
class="IBToOneOutletInfo" key="NS.object.0">
- <string
key="name">history</string>
- <string
key="candidateClassName">HistoryView</string>
- </object>
- </object>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">LocalHistoryController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSApplication</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">PSMTabBarControl/PSMTabDragAssistant.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSObject</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">PSMTabBarControl/PSMTabBarCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSObject</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">PSMTabBarControl/PSMTabBarControl.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string
key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
- <object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool
key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string
key="IBDocument.LastKnownRelativeProjectPath">../NetSurf.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- </data>
-</archive>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="13122.19" systemVersion="16F73" targetRuntime="MacOSX.Cocoa"
propertyAccessControl="none">
+ <dependencies>
+ <deployment identifier="macosx"/>
+ <development version="8000" identifier="xcode"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="13122.19"/>
+ <capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner"
customClass="LocalHistoryController">
+ <connections>
+ <outlet property="history" destination="6" id="8"/>
+ <outlet property="window" destination="1" id="7"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder"
customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO"
autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO"
visibleAtLaunch="NO" animationBehavior="default" id="1"
customClass="ArrowWindow">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES"
miniaturizable="YES" resizable="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES"
rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="196" y="240" width="480" height="270"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
+ <view key="contentView" id="2">
+ <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <scrollView autohidesScrollers="YES"
horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10"
verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="3">
+ <rect key="frame" x="-1" y="-1" width="482"
height="272"/>
+ <autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
+ <clipView key="contentView" drawsBackground="NO"
copiesOnScroll="NO" id="mPm-ZF-vKt">
+ <rect key="frame" x="1" y="1" width="480"
height="270"/>
+ <autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <customView id="6" customClass="HistoryView">
+ <rect key="frame" x="0.0" y="0.0"
width="480" height="270"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </customView>
+ </subviews>
+ <color key="backgroundColor" name="controlColor"
catalog="System" colorSpace="catalog"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES"
verticalHuggingPriority="750" arrowsPosition="none" controlSize="small"
horizontal="YES" id="5">
+ <rect key="frame" x="1" y="260" width="465"
height="11"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" hidden="YES"
verticalHuggingPriority="750" arrowsPosition="none" doubleValue="1"
controlSize="small" horizontal="NO" id="4">
+ <rect key="frame" x="470" y="1" width="11"
height="255"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ </scrollView>
+ </subviews>
+ </view>
+ </window>
+ </objects>
+</document>
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=c3b7482ce67c7c408bc028b139b651f8b8118ca6
commit c3b7482ce67c7c408bc028b139b651f8b8118ca6
Author: Sven Weidauer <[email protected]>
Commit: Sven Weidauer <[email protected]>
Close history popover after selecting a page.
diff --git a/frontends/cocoa/HistoryView.m b/frontends/cocoa/HistoryView.m
index 798a308..f935f9f 100644
--- a/frontends/cocoa/HistoryView.m
+++ b/frontends/cocoa/HistoryView.m
@@ -121,7 +121,11 @@ static struct core_window_callback_table
history_view_table = {
state = BROWSER_MOUSE_PRESS_2;
}
- local_history_mouse_action(_session, state, cocoa_pt_to_px(location.x),
cocoa_pt_to_px(location.y));
+ nserror res = local_history_mouse_action(_session, state,
cocoa_pt_to_px(location.x), cocoa_pt_to_px(location.y));
+
+ if (res == NSERROR_OK) {
+ self.browser.historyVisible = NO;
+ }
}
- (BOOL)isFlipped
-----------------------------------------------------------------------
Summary of changes:
frontends/cocoa/BlackScroller.h | 18 -
frontends/cocoa/BlackScroller.m | 156 --------
frontends/cocoa/HistoryView.m | 6 +-
frontends/cocoa/Makefile | 1 -
frontends/cocoa/NetSurf.xcodeproj/project.pbxproj | 6 -
frontends/cocoa/res/LocalHistoryPanel.xib | 409 +++------------------
6 files changed, 58 insertions(+), 538 deletions(-)
delete mode 100644 frontends/cocoa/BlackScroller.h
delete mode 100644 frontends/cocoa/BlackScroller.m
diff --git a/frontends/cocoa/BlackScroller.h b/frontends/cocoa/BlackScroller.h
deleted file mode 100644
index 3efe662..0000000
--- a/frontends/cocoa/BlackScroller.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright (c) 1011 Sven Weidauer
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. */
-
-#import <Cocoa/Cocoa.h>
-
-@interface BlackScroller : NSScroller {
- BOOL drawTrack;
- NSTrackingRectTag tag;
-}
-
-@property (readonly, getter=isHorizontal) BOOL horizontal;
-
-@end
diff --git a/frontends/cocoa/BlackScroller.m b/frontends/cocoa/BlackScroller.m
deleted file mode 100644
index df15e91..0000000
--- a/frontends/cocoa/BlackScroller.m
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright (c) 1011 Sven Weidauer
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#import "BlackScroller.h"
-
-@implementation BlackScroller
-
-- (void)setFrame:(NSRect)frameRect
-{
- [super setFrame:frameRect];
- if (tag != 0)
- [self removeTrackingRect:tag];
- tag = [self addTrackingRect:[self bounds] owner:self userData:NULL
assumeInside:NO];
-}
-
-- (void)drawRect:(NSRect)dirtyRect
-{
- [[NSColor clearColor] set];
- [NSBezierPath fillRect:dirtyRect];
-
- if (drawTrack)
- [self drawKnobSlotInRect:[self rectForPart:NSScrollerKnobSlot]
- highlight:NO];
- [self drawKnob];
-}
-
-- (void)drawKnobSlotInRect:(NSRect)slotRect highlight:(BOOL)flag
-{
- slotRect = NSInsetRect(slotRect, 2, 2);
- slotRect = [self.window convertRectToScreen:slotRect];
- slotRect.origin.x = floor(slotRect.origin.x) + 0.5;
- slotRect.origin.y = floor(slotRect.origin.y) + 0.5;
- slotRect.size.width = floor(slotRect.size.width);
- slotRect.size.height = floor(slotRect.size.height);
- slotRect = [self.window convertRectFromScreen:slotRect];
-
- NSGradient *gradient = [[NSGradient alloc] initWithColorsAndLocations:
- [NSColor clearColor], 0.0,
- [NSColor clearColor], 0.4,
- [NSColor whiteColor], 1.0,
- nil];
- [[NSColor whiteColor] set];
- const float radius = 0.5 * ([self isHorizontal] ? NSHeight(slotRect) :
NSWidth(slotRect));
- NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:slotRect
- xRadius:radius
- yRadius:radius];
- [gradient drawInBezierPath:path angle:[self isHorizontal] ? 90 : 0];
-
- [path stroke];
-}
-
-- (NSUsableScrollerParts)usableParts
-{
- return NSScrollerKnob | NSScrollerKnobSlot;
-}
-
-- (void)drawKnob
-{
- NSRect rect = NSInsetRect([self rectForPart:NSScrollerKnob], 2, 2);
-
- rect = [self.window convertRectToScreen:rect];
- rect.origin.x = floor(rect.origin.x) + 0.5;
- rect.origin.y = floor(rect.origin.y) + 0.5;
- rect.size.width = floor(rect.size.width);
- rect.size.height = floor(rect.size.height);
- rect = [self.window convertRectFromScreen:rect];
-
- [[NSColor colorWithDeviceWhite:1.0 alpha:drawTrack ? 1.0 : 0.6] set];
-
- const float radius = 0.5 * ([self isHorizontal] ? NSHeight(rect) :
NSWidth(rect));
- NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:rect
- xRadius:radius
- yRadius:radius];
- [path fill];
- [path stroke];
-}
-
-- (NSRect)rectForPart:(NSScrollerPart)partCode
-{
- const bool horizontal = [self isHorizontal];
-
- NSRect rect = horizontal ? NSInsetRect([self bounds], 4, 0) :
NSInsetRect([self bounds], 0, 4);
-
- switch (partCode) {
- case NSScrollerKnobSlot:
- return rect;
-
- case NSScrollerKnob: {
- const CGFloat len = horizontal ? NSWidth(rect) : NSHeight(rect);
- CGFloat knobLen = [self knobProportion] * len;
- const CGFloat minKnobLen = horizontal ? NSHeight(rect) : NSWidth(rect);
- if (knobLen < minKnobLen)
- knobLen = minKnobLen;
-
- const CGFloat start = [self doubleValue] * (len - knobLen);
-
- if (horizontal) {
- rect.origin.x += start;
- rect.size.width = knobLen;
- } else {
- rect.origin.y += start;
- rect.size.height = knobLen;
- }
-
- return rect;
- }
-
- default:
- return [super rectForPart:partCode];
- }
-}
-
-- (BOOL)isOpaque
-{
- return NO;
-}
-
-- (BOOL)isHorizontal
-{
- NSRect bounds = [self bounds];
- return NSWidth(bounds) > NSHeight(bounds);
-}
-
-- (void)mouseEntered:(NSEvent *)theEvent
-{
- drawTrack = YES;
- [self setNeedsDisplay:YES];
-}
-
-- (void)mouseExited:(NSEvent *)theEvent
-{
- drawTrack = NO;
- [self setNeedsDisplay:YES];
-}
-
-@end
diff --git a/frontends/cocoa/HistoryView.m b/frontends/cocoa/HistoryView.m
index 798a308..f935f9f 100644
--- a/frontends/cocoa/HistoryView.m
+++ b/frontends/cocoa/HistoryView.m
@@ -121,7 +121,11 @@ static struct core_window_callback_table
history_view_table = {
state = BROWSER_MOUSE_PRESS_2;
}
- local_history_mouse_action(_session, state, cocoa_pt_to_px(location.x),
cocoa_pt_to_px(location.y));
+ nserror res = local_history_mouse_action(_session, state,
cocoa_pt_to_px(location.x), cocoa_pt_to_px(location.y));
+
+ if (res == NSERROR_OK) {
+ self.browser.historyVisible = NO;
+ }
}
- (BOOL)isFlipped
diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index 0febfbb..212ed04 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -97,7 +97,6 @@ S_FRONTEND := \
selection.m \
ArrowBox.m \
ArrowWindow.m \
- BlackScroller.m \
LocalHistoryController.m \
apple_image.m
diff --git a/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
index bc1bee7..b4475ec 100644
--- a/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
+++ b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj
@@ -23,7 +23,6 @@
263A281D1EE40CCF005C52B9 /* ArrowBox.m in Sources */ = {isa =
PBXBuildFile; fileRef = 263A26831EE40BFC005C52B9 /* ArrowBox.m */; };
263A281E1EE40CCF005C52B9 /* ArrowWindow.m in Sources */ = {isa
= PBXBuildFile; fileRef = 263A26841EE40BFC005C52B9 /* ArrowWindow.m */; };
263A281F1EE40CCF005C52B9 /* bitmap.m in Sources */ = {isa =
PBXBuildFile; fileRef = 263A26851EE40BFC005C52B9 /* bitmap.m */; };
- 263A28201EE40CCF005C52B9 /* BlackScroller.m in Sources */ =
{isa = PBXBuildFile; fileRef = 263A26861EE40BFC005C52B9 /* BlackScroller.m */;
};
263A28211EE40CCF005C52B9 /* BookmarksController.m in Sources */
= {isa = PBXBuildFile; fileRef = 263A26871EE40BFC005C52B9 /*
BookmarksController.m */; };
263A28221EE40CCF005C52B9 /* BrowserView.m in Sources */ = {isa
= PBXBuildFile; fileRef = 263A26881EE40BFC005C52B9 /* BrowserView.m */; };
263A28231EE40CCF005C52B9 /* BrowserViewController.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 263A26891EE40BFC005C52B9 /*
BrowserViewController.m */; };
@@ -295,7 +294,6 @@
263A26621EE40BFC005C52B9 /* ArrowBox.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
ArrowBox.h; sourceTree = SOURCE_ROOT; };
263A26631EE40BFC005C52B9 /* ArrowWindow.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
ArrowWindow.h; sourceTree = SOURCE_ROOT; };
263A26641EE40BFC005C52B9 /* bitmap.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
bitmap.h; sourceTree = SOURCE_ROOT; };
- 263A26651EE40BFC005C52B9 /* BlackScroller.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BlackScroller.h; sourceTree = SOURCE_ROOT; };
263A26661EE40BFC005C52B9 /* BookmarksController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BookmarksController.h; sourceTree = SOURCE_ROOT; };
263A26671EE40BFC005C52B9 /* BrowserView.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BrowserView.h; sourceTree = SOURCE_ROOT; };
263A26681EE40BFC005C52B9 /* BrowserViewController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BrowserViewController.h; sourceTree = SOURCE_ROOT; };
@@ -328,7 +326,6 @@
263A26831EE40BFC005C52B9 /* ArrowBox.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= ArrowBox.m; sourceTree = SOURCE_ROOT; };
263A26841EE40BFC005C52B9 /* ArrowWindow.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= ArrowWindow.m; sourceTree = SOURCE_ROOT; };
263A26851EE40BFC005C52B9 /* bitmap.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= bitmap.m; sourceTree = SOURCE_ROOT; };
- 263A26861EE40BFC005C52B9 /* BlackScroller.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BlackScroller.m; sourceTree = SOURCE_ROOT; };
263A26871EE40BFC005C52B9 /* BookmarksController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BookmarksController.m; sourceTree = SOURCE_ROOT; };
263A26881EE40BFC005C52B9 /* BrowserView.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BrowserView.m; sourceTree = SOURCE_ROOT; };
263A26891EE40BFC005C52B9 /* BrowserViewController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BrowserViewController.m; sourceTree = SOURCE_ROOT; };
@@ -748,7 +745,6 @@
263A26621EE40BFC005C52B9 /* ArrowBox.h */,
263A26631EE40BFC005C52B9 /* ArrowWindow.h */,
263A26641EE40BFC005C52B9 /* bitmap.h */,
- 263A26651EE40BFC005C52B9 /* BlackScroller.h */,
263A26661EE40BFC005C52B9 /*
BookmarksController.h */,
263A26671EE40BFC005C52B9 /* BrowserView.h */,
263A26681EE40BFC005C52B9 /*
BrowserViewController.h */,
@@ -781,7 +777,6 @@
263A26831EE40BFC005C52B9 /* ArrowBox.m */,
263A26841EE40BFC005C52B9 /* ArrowWindow.m */,
263A26851EE40BFC005C52B9 /* bitmap.m */,
- 263A26861EE40BFC005C52B9 /* BlackScroller.m */,
263A26871EE40BFC005C52B9 /*
BookmarksController.m */,
263A26881EE40BFC005C52B9 /* BrowserView.m */,
263A26891EE40BFC005C52B9 /*
BrowserViewController.m */,
@@ -1723,7 +1718,6 @@
263A28171EE40CCF005C52B9 /*
PSMTabDragAssistant.m in Sources */,
263A287A1EE40CFB005C52B9 /* version.c in
Sources */,
263A28741EE40CFB005C52B9 /* selection.c in
Sources */,
- 263A28201EE40CCF005C52B9 /* BlackScroller.m in
Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/frontends/cocoa/res/LocalHistoryPanel.xib
b/frontends/cocoa/res/LocalHistoryPanel.xib
index 794d2db..5f2d688 100644
--- a/frontends/cocoa/res/LocalHistoryPanel.xib
+++ b/frontends/cocoa/res/LocalHistoryPanel.xib
@@ -1,357 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
- <object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
- <string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">804</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects"
id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomObject" id="1001">
- <string
key="NSClassName">LocalHistoryController</string>
- </object>
- <object class="NSCustomObject" id="1003">
- <string
key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="1004">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSWindowTemplate" id="1005">
- <int key="NSWindowStyleMask">15</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{196, 240}, {480,
270}}</string>
- <int key="NSWTFlags">1618477056</int>
- <string key="NSWindowTitle">Window</string>
- <string key="NSWindowClass">ArrowWindow</string>
- <nil key="NSViewClass"/>
- <string
key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
- <object class="NSView" key="NSWindowView"
id="1006">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <object class="NSMutableArray"
key="NSSubviews">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <object class="NSScrollView"
id="488267087">
- <reference
key="NSNextResponder" ref="1006"/>
- <int
key="NSvFlags">274</int>
- <object
class="NSMutableArray" key="NSSubviews">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <object
class="NSClipView" id="753770525">
-
<reference key="NSNextResponder" ref="488267087"/>
- <int
key="NSvFlags">2304</int>
- <object
class="NSMutableArray" key="NSSubviews">
-
<bool key="EncodedWithXMLCoder">YES</bool>
-
<object class="NSCustomView" id="820702167">
-
<reference key="NSNextResponder" ref="753770525"/>
-
<int key="NSvFlags">256</int>
-
<string key="NSFrameSize">{480, 270}</string>
-
<reference key="NSSuperview" ref="753770525"/>
-
<string key="NSClassName">HistoryView</string>
-
</object>
-
</object>
- <string
key="NSFrame">{{1, 1}, {480, 270}}</string>
-
<reference key="NSSuperview" ref="488267087"/>
-
<reference key="NSNextKeyView" ref="820702167"/>
-
<reference key="NSDocView" ref="820702167"/>
- <object
class="NSColor" key="NSBGColor">
-
<int key="NSColorSpace">6</int>
-
<string key="NSCatalogName">System</string>
-
<string key="NSColorName">controlColor</string>
-
<object class="NSColor" key="NSColor">
-
<int key="NSColorSpace">3</int>
-
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-
</object>
-
</object>
- <int
key="NScvFlags">2</int>
- </object>
- <object
class="NSScroller" id="84195230">
-
<reference key="NSNextResponder" ref="488267087"/>
- <int
key="NSvFlags">-2147483392</int>
- <string
key="NSFrame">{{470, 1}, {11, 255}}</string>
-
<reference key="NSSuperview" ref="488267087"/>
- <int
key="NSsFlags">256</int>
- <int
key="NSArrowsLoc">2</int>
-
<reference key="NSTarget" ref="488267087"/>
- <string
key="NSAction">_doScroller:</string>
- <double
key="NSCurValue">1</double>
- <double
key="NSPercent">0.96363627910614014</double>
- </object>
- <object
class="NSScroller" id="645365106">
-
<reference key="NSNextResponder" ref="488267087"/>
- <int
key="NSvFlags">-2147483392</int>
- <string
key="NSFrame">{{1, 260}, {465, 11}}</string>
-
<reference key="NSSuperview" ref="488267087"/>
- <int
key="NSsFlags">257</int>
- <int
key="NSArrowsLoc">2</int>
-
<reference key="NSTarget" ref="488267087"/>
- <string
key="NSAction">_doScroller:</string>
- <double
key="NSPercent">0.50602412223815918</double>
- </object>
- </object>
- <string
key="NSFrame">{{-1, -1}, {482, 272}}</string>
- <reference
key="NSSuperview" ref="1006"/>
- <reference
key="NSNextKeyView" ref="753770525"/>
- <int
key="NSsFlags">562</int>
- <reference
key="NSVScroller" ref="84195230"/>
- <reference
key="NSHScroller" ref="645365106"/>
- <reference
key="NSContentView" ref="753770525"/>
- </object>
- </object>
- <string key="NSFrameSize">{480,
270}</string>
- <reference key="NSSuperview"/>
- </object>
- <string key="NSScreenRect">{{0, 0}, {1680,
1028}}</string>
- <string key="NSMaxSize">{1.79769e+308,
1.79769e+308}</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection"
key="connection">
- <string
key="label">window</string>
- <reference key="source"
ref="1001"/>
- <reference key="destination"
ref="1005"/>
- </object>
- <int key="connectionID">7</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection"
key="connection">
- <string
key="label">history</string>
- <reference key="source"
ref="1001"/>
- <reference key="destination"
ref="820702167"/>
- </object>
- <int key="connectionID">8</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <reference key="object"
ref="0"/>
- <reference key="children"
ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object"
ref="1001"/>
- <reference key="parent"
ref="0"/>
- <string key="objectName">File's
Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object"
ref="1003"/>
- <reference key="parent"
ref="0"/>
- <string key="objectName">First
Responder</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-3</int>
- <reference key="object"
ref="1004"/>
- <reference key="parent"
ref="0"/>
- <string
key="objectName">Application</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object"
ref="1005"/>
- <object class="NSMutableArray"
key="children">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1006"/>
- </object>
- <reference key="parent"
ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object"
ref="1006"/>
- <object class="NSMutableArray"
key="children">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <reference
ref="488267087"/>
- </object>
- <reference key="parent"
ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3</int>
- <reference key="object"
ref="488267087"/>
- <object class="NSMutableArray"
key="children">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <reference
ref="84195230"/>
- <reference
ref="645365106"/>
- <reference
ref="820702167"/>
- </object>
- <reference key="parent"
ref="1006"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4</int>
- <reference key="object"
ref="84195230"/>
- <reference key="parent"
ref="488267087"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object"
ref="645365106"/>
- <reference key="parent"
ref="488267087"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6</int>
- <reference key="object"
ref="820702167"/>
- <reference key="parent"
ref="488267087"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary"
key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool
key="EncodedWithXMLCoder">YES</bool>
-
<string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
-
<string>1.IBWindowTemplateEditedContentRect</string>
-
<string>1.NSWindowTemplate.visibleAtLaunch</string>
- <string>1.WindowOrigin</string>
-
<string>1.editorWindowContentRectSynchronizationRect</string>
- <string>2.IBPluginDependency</string>
- <string>3.IBPluginDependency</string>
-
<string>3.IBViewBoundsToFrameTransform</string>
- <string>4.CustomClassName</string>
- <string>4.IBPluginDependency</string>
- <string>5.CustomClassName</string>
- <string>5.IBPluginDependency</string>
- <string>6.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray"
key="dict.values">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- <string>{{364, 310}, {480,
270}}</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{364, 310}, {480,
270}}</string>
- <boolean value="NO"/>
- <string>{196, 240}</string>
- <string>{{202, 428}, {480,
270}}</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSAffineTransform">
- <bytes
key="NSTransformStruct">P4AAAL+AAAC/gAAAw4aAAA</bytes>
- </object>
- <string>BlackScroller</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>BlackScroller</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary"
key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray"
key="dict.values">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray"
key="dict.values">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">8</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray"
key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string
key="className">ArrowWindow</string>
- <string
key="superclassName">NSWindow</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">ArrowWindow.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">BlackScroller</string>
- <string
key="superclassName">NSScroller</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">BlackScroller.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">HistoryView</string>
- <string
key="superclassName">NSView</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">HistoryView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">LocalHistoryController</string>
- <string
key="superclassName">NSWindowController</string>
- <object class="NSMutableDictionary"
key="outlets">
- <string
key="NS.key.0">history</string>
- <string
key="NS.object.0">HistoryView</string>
- </object>
- <object class="NSMutableDictionary"
key="toOneOutletInfosByName">
- <string
key="NS.key.0">history</string>
- <object
class="IBToOneOutletInfo" key="NS.object.0">
- <string
key="name">history</string>
- <string
key="candidateClassName">HistoryView</string>
- </object>
- </object>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">LocalHistoryController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSApplication</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">PSMTabBarControl/PSMTabDragAssistant.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSObject</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">PSMTabBarControl/PSMTabBarCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSObject</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">PSMTabBarControl/PSMTabBarControl.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string
key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
- <object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool
key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string
key="IBDocument.LastKnownRelativeProjectPath">../NetSurf.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- </data>
-</archive>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="13122.19" systemVersion="16F73" targetRuntime="MacOSX.Cocoa"
propertyAccessControl="none">
+ <dependencies>
+ <deployment identifier="macosx"/>
+ <development version="8000" identifier="xcode"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="13122.19"/>
+ <capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner"
customClass="LocalHistoryController">
+ <connections>
+ <outlet property="history" destination="6" id="8"/>
+ <outlet property="window" destination="1" id="7"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder"
customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO"
autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO"
visibleAtLaunch="NO" animationBehavior="default" id="1"
customClass="ArrowWindow">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES"
miniaturizable="YES" resizable="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES"
rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="196" y="240" width="480" height="270"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
+ <view key="contentView" id="2">
+ <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <scrollView autohidesScrollers="YES"
horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10"
verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="3">
+ <rect key="frame" x="-1" y="-1" width="482"
height="272"/>
+ <autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
+ <clipView key="contentView" drawsBackground="NO"
copiesOnScroll="NO" id="mPm-ZF-vKt">
+ <rect key="frame" x="1" y="1" width="480"
height="270"/>
+ <autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <customView id="6" customClass="HistoryView">
+ <rect key="frame" x="0.0" y="0.0"
width="480" height="270"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </customView>
+ </subviews>
+ <color key="backgroundColor" name="controlColor"
catalog="System" colorSpace="catalog"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES"
verticalHuggingPriority="750" arrowsPosition="none" controlSize="small"
horizontal="YES" id="5">
+ <rect key="frame" x="1" y="260" width="465"
height="11"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" hidden="YES"
verticalHuggingPriority="750" arrowsPosition="none" doubleValue="1"
controlSize="small" horizontal="NO" id="4">
+ <rect key="frame" x="470" y="1" width="11"
height="255"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ </scrollView>
+ </subviews>
+ </view>
+ </window>
+ </objects>
+</document>
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
