summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman (saurik) <saurik@saurik.com>2013-12-22 06:11:03 -0800
committerJay Freeman (saurik) <saurik@saurik.com>2013-12-22 06:11:03 -0800
commita7bc69f5491e730e13e78ec4e028c22b3ba03023 (patch)
tree4ad9039a5919cdbb709bf978e7126be15584bc1f
parent1d6f826cb8c3379abfc6ac69cb42d356a8f4b523 (diff)
Emergency commit of my background color changes.
-rw-r--r--CyteKit/WebViewController.mm29
1 files changed, 8 insertions, 21 deletions
diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 15e7a96..f853710 100644
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -578,19 +578,16 @@ float CYScrollViewDecelerationRateNormal;
float blue([[rgb blue] getFloatValue:DOM_CSS_NUMBER]);
float alpha([[rgb alpha] getFloatValue:DOM_CSS_NUMBER]);
- if (red == 0xc7 && green == 0xce && blue == 0xd5)
- uic = [UIColor pinStripeColor];
- else if (alpha != 0)
- uic = [UIColor
- colorWithRed:(red / 255)
- green:(green / 255)
- blue:(blue / 255)
- alpha:alpha
- ];
+ uic = [UIColor
+ colorWithRed:(red / 255)
+ green:(green / 255)
+ blue:(blue / 255)
+ alpha:alpha
+ ];
}
}
- [scroller_ setBackgroundColor:(uic ?: [UIColor clearColor])];
+ [scroller_ setBackgroundColor:uic];
break;
}
}
@@ -898,11 +895,6 @@ float CYScrollViewDecelerationRateNormal;
// XXX: I think this improves scrolling; the hardcoded-ness sucks
[document setTileSize:CGSizeMake(320, 500)];
- [document setBackgroundColor:[UIColor clearColor]];
-
- // XXX: this is terribly (too?) expensive
- [document setDrawsBackground:NO];
-
WebView *webview([document webView]);
WebPreferences *preferences([webview preferences]);
@@ -958,7 +950,7 @@ float CYScrollViewDecelerationRateNormal;
}
[scroller_ setFixedBackgroundPattern:YES];
- [scroller_ setBackgroundColor:[UIColor clearColor]];
+ [scroller_ setBackgroundColor:[UIColor groupTableViewBackgroundColor]];
[scroller_ setClipsSubviews:YES];
[scroller_ setBounces:YES];
@@ -967,11 +959,6 @@ float CYScrollViewDecelerationRateNormal;
[self setViewportWidth:width_];
- UITableView *table([[[UITableView alloc] initWithFrame:[webview_ bounds] style:UITableViewStyleGrouped] autorelease]);
- [table setScrollsToTop:NO];
- [webview_ insertSubview:table atIndex:0];
-
- [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
[webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
ready_ = false;