[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:24:01 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2805ee8b6a2601eeb33399c0acd9981292122290
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 11 23:51:03 2002 +0000
WebKit:
- fixed 2980779 -- no scroll bar in history window
* WebKit.pbproj/project.pbxproj: Removed nonexistent .h file from project list (IFGrabBag.h)
* WebView.subproj/IFDynamicScrollBarsView.h: Renamed field allowsScrolling to disallowsScrolling
* WebView.subproj/IFDynamicScrollBarsView.m:
(-[IFDynamicScrollBarsView updateScrollers]):
(-[IFDynamicScrollBarsView setAllowsScrolling:]):
(-[IFDynamicScrollBarsView allowsScrolling]):
Removed initWithFrame override, whose only purpose was to set allowsScrolling to the "default"
value (but not good enough for load-from-nib case). Changed all users of allowsScrolling to
!disallowsScrolling instead.
WebBrowser:
- made History menu show all history, not just most recent
- futzed around with some view positions
- fixed 2988910 -- Favorites bar does not show links until restart
- made Favorites bar do fewer unnecessary relayouts
* BrowserWindow.m:
(-[BrowserWindow toggleFavoritesBarWithAnimation:]):
(-[BrowserWindow toggleStatusBarWithAnimation:]):
Tweaked some constants.
* Defaults.plist: Changed default number of items in History menu
(now used only for flat part of menu) to 10.
* English.lproj/Browser.nib: Pushed some pixels
* English.lproj/MainMenu.nib: Changed "Show All History" to
"Show History in Window" since the menu now shows all history
* FavoritesBar.h: Added _lastWidth and _buttonHeight ivars
* FavoritesBar.m:
(-[FavoritesBar _refreshButtons]): Use _buttonHeight ivar instead of
measuring height, since bar might be shrunken down into nothingness.
(-[FavoritesBar _favoritesViewFrameChanged:]): Only lay out again if
width has changed
(-[FavoritesBar initWithView:]): set _buttonHeight based on initial height
* GlobalHistory.m:
(-[GlobalHistory _insertItemsForDate:intoMenu:atIndex:withRunningTotal:limit:]):
add no-limit case
(-[GlobalHistory _insertSubmenu:withTitle:atIndex:]): generalized slightly from
old _insertSubmenu:forDate:atIndex:
(-[GlobalHistory _addHistoryToMenu]): add all history, but limit flat part of
menu; only add submenu for today if there are more today entries than fit in flat
part; don't add separator after today's entries if there are no submenus; use
_insertSubmenu:withTitle:atIndex: instead of _insertSubmenu:forDate:atIndex:
* NSViewAdditions.h:
* NSViewAdditions.m:
(-[NSView retileAllScrollViews]):
New method to work around AppKit bug involving scroll bar placement.
* WebBrowser.pbproj/project.pbxproj: The Preferences group had fallen inside
Search at some point in the past; rescued it.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1540 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 537ad4a..d18876d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-07-11 John Sullivan <sullivan at apple.com>
+
+ - fixed 2980779 -- no scroll bar in history window
+
+ * WebKit.pbproj/project.pbxproj: Removed nonexistent .h file from project list (IFGrabBag.h)
+
+ * WebView.subproj/IFDynamicScrollBarsView.h: Renamed field allowsScrolling to disallowsScrolling
+ * WebView.subproj/IFDynamicScrollBarsView.m:
+ (-[IFDynamicScrollBarsView updateScrollers]):
+ (-[IFDynamicScrollBarsView setAllowsScrolling:]):
+ (-[IFDynamicScrollBarsView allowsScrolling]):
+ Removed initWithFrame override, whose only purpose was to set allowsScrolling to the "default"
+ value (but not good enough for load-from-nib case). Changed all users of allowsScrolling to
+ !disallowsScrolling instead.
+
2002-07-11 Chris Blumenberg <cblu at apple.com>
* Plugins.subproj/IFPluginNullEventSender.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 537ad4a..d18876d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-07-11 John Sullivan <sullivan at apple.com>
+
+ - fixed 2980779 -- no scroll bar in history window
+
+ * WebKit.pbproj/project.pbxproj: Removed nonexistent .h file from project list (IFGrabBag.h)
+
+ * WebView.subproj/IFDynamicScrollBarsView.h: Renamed field allowsScrolling to disallowsScrolling
+ * WebView.subproj/IFDynamicScrollBarsView.m:
+ (-[IFDynamicScrollBarsView updateScrollers]):
+ (-[IFDynamicScrollBarsView setAllowsScrolling:]):
+ (-[IFDynamicScrollBarsView allowsScrolling]):
+ Removed initWithFrame override, whose only purpose was to set allowsScrolling to the "default"
+ value (but not good enough for load-from-nib case). Changed all users of allowsScrolling to
+ !disallowsScrolling instead.
+
2002-07-11 Chris Blumenberg <cblu at apple.com>
* Plugins.subproj/IFPluginNullEventSender.h:
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 0336cb0..d554c80 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -194,7 +194,6 @@
25A5593301A5996D0ECA149E,
39446088020F50ED0ECA1767,
3944608B020F50ED0ECA1767,
- 3944608C020F50ED0ECA1767,
3944608D020F50ED0ECA1767,
3944608E020F50ED0ECA1767,
3944608F020F50ED0ECA1767,
@@ -803,12 +802,6 @@
path = WebView.subproj/IFDynamicScrollBarsView.m;
refType = 4;
};
- 3944606D020F50ED0ECA1767 = {
- isa = PBXFileReference;
- name = IFGrabBag.h;
- path = WebView.subproj/IFGrabBag.h;
- refType = 4;
- };
3944606E020F50ED0ECA1767 = {
isa = PBXFileReference;
name = IFPreferences.h;
@@ -932,12 +925,6 @@
);
};
};
- 3944608C020F50ED0ECA1767 = {
- fileRef = 3944606D020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
3944608D020F50ED0ECA1767 = {
fileRef = 3944606E020F50ED0ECA1767;
isa = PBXBuildFile;
@@ -1111,7 +1098,6 @@
F5F81C3602B67C0F018635CA,
3944606B020F50ED0ECA1767,
3944606C020F50ED0ECA1767,
- 3944606D020F50ED0ECA1767,
35081D9202B6D4D80ACA2ACA,
35081D9302B6D4D80ACA2ACA,
35081D9402B6D4D80ACA2ACA,
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.h b/WebKit/WebView.subproj/IFDynamicScrollBarsView.h
index e16e195..ba9e4c0 100644
--- a/WebKit/WebView.subproj/IFDynamicScrollBarsView.h
+++ b/WebKit/WebView.subproj/IFDynamicScrollBarsView.h
@@ -16,7 +16,7 @@
@interface IFDynamicScrollBarsView : NSScrollView <WebCoreFrameView>
{
NSCursor *cursor;
- BOOL allowsScrolling;
+ BOOL disallowsScrolling;
}
- (void)setAllowsScrolling:(BOOL)flag;
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
index af30182..f733c69 100644
--- a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
@@ -10,19 +10,12 @@
@implementation IFDynamicScrollBarsView
-- initWithFrame:(NSRect)frame
-{
- [super initWithFrame:frame];
- allowsScrolling = YES;
- return self;
-}
-
- (void)updateScrollers
{
BOOL scrollsVertically;
BOOL scrollsHorizontally;
- if (!allowsScrolling) {
+ if (disallowsScrolling) {
scrollsVertically = NO;
scrollsHorizontally = NO;
} else {
@@ -105,13 +98,13 @@
- (void)setAllowsScrolling:(BOOL)flag
{
- allowsScrolling = flag;
+ disallowsScrolling = !flag;
[self updateScrollers];
}
- (BOOL)allowsScrolling
{
- return allowsScrolling;
+ return !disallowsScrolling;
}
@end
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
index e16e195..ba9e4c0 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
@@ -16,7 +16,7 @@
@interface IFDynamicScrollBarsView : NSScrollView <WebCoreFrameView>
{
NSCursor *cursor;
- BOOL allowsScrolling;
+ BOOL disallowsScrolling;
}
- (void)setAllowsScrolling:(BOOL)flag;
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index af30182..f733c69 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -10,19 +10,12 @@
@implementation IFDynamicScrollBarsView
-- initWithFrame:(NSRect)frame
-{
- [super initWithFrame:frame];
- allowsScrolling = YES;
- return self;
-}
-
- (void)updateScrollers
{
BOOL scrollsVertically;
BOOL scrollsHorizontally;
- if (!allowsScrolling) {
+ if (disallowsScrolling) {
scrollsVertically = NO;
scrollsHorizontally = NO;
} else {
@@ -105,13 +98,13 @@
- (void)setAllowsScrolling:(BOOL)flag
{
- allowsScrolling = flag;
+ disallowsScrolling = !flag;
[self updateScrollers];
}
- (BOOL)allowsScrolling
{
- return allowsScrolling;
+ return !disallowsScrolling;
}
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list