Changeset 16831 in webkit
- Timestamp:
- Oct 5, 2006 6:23:47 PM (17 years ago)
- Location:
- trunk/WebKit
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/ChangeLog
r16823 r16831 1 2006-10-05 Adele Peterson <adele@apple.com> 2 3 Reviewed by the letter 'B'. 4 5 More build fixes. 6 7 * WebKit.xcodeproj/project.pbxproj: 8 * WebView/WebDynamicScrollBarsView.h: 9 * WebView/WebDynamicScrollBarsView.m: 10 (-[WebDynamicScrollBarsView updateScrollers]): 11 (-[WebDynamicScrollBarsView setAllowsScrolling:]): 12 (-[WebDynamicScrollBarsView allowsScrolling]): 13 (-[WebDynamicScrollBarsView setAllowsHorizontalScrolling:]): 14 (-[WebDynamicScrollBarsView setAllowsVerticalScrolling:]): 15 (-[WebDynamicScrollBarsView allowsHorizontalScrolling]): 16 (-[WebDynamicScrollBarsView allowsVerticalScrolling]): 17 (-[WebDynamicScrollBarsView horizontalScrollingMode]): 18 (-[WebDynamicScrollBarsView verticalScrollingMode]): 19 (-[WebDynamicScrollBarsView setHorizontalScrollingMode:]): 20 (-[WebDynamicScrollBarsView setVerticalScrollingMode:]): 21 (-[WebDynamicScrollBarsView setScrollingMode:]): 22 * WebView/WebView.m: 23 (-[WebView setAlwaysShowVerticalScroller:]): 24 (-[WebView alwaysShowVerticalScroller]): 25 (-[WebView setAlwaysShowHorizontalScroller:]): 26 (-[WebView alwaysShowHorizontalScroller]): 27 1 28 2006-10-05 Vladimir Olexa <vladimir.olexa@gmail.com> 2 29 -
trunk/WebKit/WebKit.xcodeproj/project.pbxproj
r16818 r16831 1256 1256 isa = PBXProject; 1257 1257 buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */; 1258 compatibilityVersion = "Xcode 2.4";1259 1258 hasScannedForEncodings = 1; 1260 1259 knownRegions = ( … … 1270 1269 productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; 1271 1270 projectDirPath = ""; 1272 projectRoot = "";1273 shouldCheckCompatibility = 1;1274 1271 targets = ( 1275 1272 9398100A0824BF01008DF038 /* WebKit */, -
trunk/WebKit/WebView/WebDynamicScrollBarsView.h
r14771 r16831 34 34 @interface WebDynamicScrollBarsView : NSScrollView <WebCoreFrameView> 35 35 { 36 WebCoreScroll BarMode hScroll;37 WebCoreScroll BarMode vScroll;36 WebCoreScrollbarMode hScroll; 37 WebCoreScrollbarMode vScroll; 38 38 BOOL hScrollModeLocked; 39 39 BOOL vScrollModeLocked; -
trunk/WebKit/WebView/WebDynamicScrollBarsView.m
r14771 r16831 70 70 71 71 if (!suppressLayout && !suppressScrollers && 72 (hScroll == WebCoreScroll BarAuto || vScroll == WebCoreScrollBarAuto))72 (hScroll == WebCoreScrollbarAuto || vScroll == WebCoreScrollbarAuto)) 73 73 { 74 74 // Do a layout if pending, before checking if scrollbars are needed. … … 84 84 NSSize frameSize = [self frame].size; 85 85 86 scrollsVertically = (vScroll == WebCoreScroll BarAlwaysOn) ||87 (vScroll == WebCoreScroll BarAuto && documentSize.height > frameSize.height);86 scrollsVertically = (vScroll == WebCoreScrollbarAlwaysOn) || 87 (vScroll == WebCoreScrollbarAuto && documentSize.height > frameSize.height); 88 88 if (scrollsVertically) 89 scrollsHorizontally = (hScroll == WebCoreScroll BarAlwaysOn) ||90 (hScroll == WebCoreScroll BarAuto && documentSize.width + [NSScroller scrollerWidth] > frameSize.width);89 scrollsHorizontally = (hScroll == WebCoreScrollbarAlwaysOn) || 90 (hScroll == WebCoreScrollbarAuto && documentSize.width + [NSScroller scrollerWidth] > frameSize.width); 91 91 else { 92 scrollsHorizontally = (hScroll == WebCoreScroll BarAlwaysOn) ||93 (hScroll == WebCoreScroll BarAuto && documentSize.width > frameSize.width);92 scrollsHorizontally = (hScroll == WebCoreScrollbarAlwaysOn) || 93 (hScroll == WebCoreScrollbarAuto && documentSize.width > frameSize.width); 94 94 if (scrollsHorizontally) 95 scrollsVertically = (vScroll == WebCoreScroll BarAlwaysOn) ||96 (vScroll == WebCoreScroll BarAuto && documentSize.height + [NSScroller scrollerWidth] > frameSize.height);95 scrollsVertically = (vScroll == WebCoreScrollbarAlwaysOn) || 96 (vScroll == WebCoreScrollbarAuto && documentSize.height + [NSScroller scrollerWidth] > frameSize.height); 97 97 } 98 98 } 99 99 else { 100 scrollsHorizontally = (hScroll == WebCoreScroll BarAuto) ? hasHorizontalScroller : (hScroll == WebCoreScrollBarAlwaysOn);101 scrollsVertically = (vScroll == WebCoreScroll BarAuto) ? hasVerticalScroller : (vScroll == WebCoreScrollBarAlwaysOn);100 scrollsHorizontally = (hScroll == WebCoreScrollbarAuto) ? hasHorizontalScroller : (hScroll == WebCoreScrollbarAlwaysOn); 101 scrollsVertically = (vScroll == WebCoreScrollbarAuto) ? hasVerticalScroller : (vScroll == WebCoreScrollbarAlwaysOn); 102 102 } 103 103 … … 148 148 return; 149 149 150 if (flag && vScroll == WebCoreScroll BarAlwaysOff)151 vScroll = WebCoreScroll BarAuto;152 else if (!flag && vScroll != WebCoreScroll BarAlwaysOff)153 vScroll = WebCoreScroll BarAlwaysOff;154 155 if (flag && hScroll == WebCoreScroll BarAlwaysOff)156 hScroll = WebCoreScroll BarAuto;157 else if (!flag && hScroll != WebCoreScroll BarAlwaysOff)158 hScroll = WebCoreScroll BarAlwaysOff;150 if (flag && vScroll == WebCoreScrollbarAlwaysOff) 151 vScroll = WebCoreScrollbarAuto; 152 else if (!flag && vScroll != WebCoreScrollbarAlwaysOff) 153 vScroll = WebCoreScrollbarAlwaysOff; 154 155 if (flag && hScroll == WebCoreScrollbarAlwaysOff) 156 hScroll = WebCoreScrollbarAuto; 157 else if (!flag && hScroll != WebCoreScrollbarAlwaysOff) 158 hScroll = WebCoreScrollbarAlwaysOff; 159 159 160 160 [self updateScrollers]; … … 164 164 { 165 165 // Returns YES if either horizontal or vertical scrolling is allowed. 166 return hScroll != WebCoreScroll BarAlwaysOff || vScroll != WebCoreScrollBarAlwaysOff;166 return hScroll != WebCoreScrollbarAlwaysOff || vScroll != WebCoreScrollbarAlwaysOff; 167 167 } 168 168 … … 171 171 if (hScrollModeLocked) 172 172 return; 173 if (flag && hScroll == WebCoreScroll BarAlwaysOff)174 hScroll = WebCoreScroll BarAuto;175 else if (!flag && hScroll != WebCoreScroll BarAlwaysOff)176 hScroll = WebCoreScroll BarAlwaysOff;173 if (flag && hScroll == WebCoreScrollbarAlwaysOff) 174 hScroll = WebCoreScrollbarAuto; 175 else if (!flag && hScroll != WebCoreScrollbarAlwaysOff) 176 hScroll = WebCoreScrollbarAlwaysOff; 177 177 [self updateScrollers]; 178 178 } … … 182 182 if (vScrollModeLocked) 183 183 return; 184 if (flag && vScroll == WebCoreScroll BarAlwaysOff)185 vScroll = WebCoreScroll BarAuto;186 else if (!flag && vScroll != WebCoreScroll BarAlwaysOff)187 vScroll = WebCoreScroll BarAlwaysOff;184 if (flag && vScroll == WebCoreScrollbarAlwaysOff) 185 vScroll = WebCoreScrollbarAuto; 186 else if (!flag && vScroll != WebCoreScrollbarAlwaysOff) 187 vScroll = WebCoreScrollbarAlwaysOff; 188 188 [self updateScrollers]; 189 189 } … … 191 191 - (BOOL)allowsHorizontalScrolling 192 192 { 193 return hScroll != WebCoreScroll BarAlwaysOff;193 return hScroll != WebCoreScrollbarAlwaysOff; 194 194 } 195 195 196 196 - (BOOL)allowsVerticalScrolling 197 197 { 198 return vScroll != WebCoreScroll BarAlwaysOff;199 } 200 201 -(WebCoreScroll BarMode)horizontalScrollingMode198 return vScroll != WebCoreScrollbarAlwaysOff; 199 } 200 201 -(WebCoreScrollbarMode)horizontalScrollingMode 202 202 { 203 203 return hScroll; 204 204 } 205 205 206 -(WebCoreScroll BarMode)verticalScrollingMode206 -(WebCoreScrollbarMode)verticalScrollingMode 207 207 { 208 208 return vScroll; 209 209 } 210 210 211 - (void)setHorizontalScrollingMode:(WebCoreScroll BarMode)mode211 - (void)setHorizontalScrollingMode:(WebCoreScrollbarMode)mode 212 212 { 213 213 if (mode == hScroll || hScrollModeLocked) … … 217 217 } 218 218 219 - (void)setVerticalScrollingMode:(WebCoreScroll BarMode)mode219 - (void)setVerticalScrollingMode:(WebCoreScrollbarMode)mode 220 220 { 221 221 if (mode == vScroll || vScrollModeLocked) … … 225 225 } 226 226 227 - (void)setScrollingMode:(WebCoreScroll BarMode)mode227 - (void)setScrollingMode:(WebCoreScrollbarMode)mode 228 228 { 229 229 if ((mode == vScroll && mode == hScroll) || (vScrollModeLocked && hScrollModeLocked)) -
trunk/WebKit/WebView/WebView.m
r16823 r16831 1465 1465 WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView]; 1466 1466 if (flag) { 1467 [scrollview setVerticalScrollingMode:WebCoreScroll BarAlwaysOn];1467 [scrollview setVerticalScrollingMode:WebCoreScrollbarAlwaysOn]; 1468 1468 [scrollview setVerticalScrollingModeLocked:YES]; 1469 1469 } else { 1470 1470 [scrollview setVerticalScrollingModeLocked:NO]; 1471 [scrollview setVerticalScrollingMode:WebCoreScroll BarAuto];1471 [scrollview setVerticalScrollingMode:WebCoreScrollbarAuto]; 1472 1472 } 1473 1473 } … … 1476 1476 { 1477 1477 WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView]; 1478 return [scrollview verticalScrollingModeLocked] && [scrollview verticalScrollingMode] == WebCoreScroll BarAlwaysOn;1478 return [scrollview verticalScrollingModeLocked] && [scrollview verticalScrollingMode] == WebCoreScrollbarAlwaysOn; 1479 1479 } 1480 1480 … … 1483 1483 WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView]; 1484 1484 if (flag) { 1485 [scrollview setHorizontalScrollingMode:WebCoreScroll BarAlwaysOn];1485 [scrollview setHorizontalScrollingMode:WebCoreScrollbarAlwaysOn]; 1486 1486 [scrollview setHorizontalScrollingModeLocked:YES]; 1487 1487 } else { 1488 1488 [scrollview setHorizontalScrollingModeLocked:NO]; 1489 [scrollview setHorizontalScrollingMode:WebCoreScroll BarAuto];1489 [scrollview setHorizontalScrollingMode:WebCoreScrollbarAuto]; 1490 1490 } 1491 1491 } … … 1499 1499 { 1500 1500 WebDynamicScrollBarsView *scrollview = (WebDynamicScrollBarsView *)[[[self mainFrame] frameView] _scrollView]; 1501 return [scrollview horizontalScrollingModeLocked] && [scrollview horizontalScrollingMode] == WebCoreScroll BarAlwaysOn;1501 return [scrollview horizontalScrollingModeLocked] && [scrollview horizontalScrollingMode] == WebCoreScrollbarAlwaysOn; 1502 1502 } 1503 1503
Note: See TracChangeset
for help on using the changeset viewer.