mirror of
https://github.com/darlinghq/darling-cocotron.git
synced 2024-10-07 17:43:28 +00:00
switch from using NSView to NSGraphicsContext for isFlipped status
This commit is contained in:
parent
984ca6a6ac
commit
4bd01aab63
@ -478,7 +478,7 @@ arrayWithArray:[_name componentsSeparatedByString:blank]];
|
||||
CGContextSetFontSize(cgContext,_pointSize);
|
||||
|
||||
// FIX, should check the focusView in the context instead of NSView's
|
||||
if([[NSView focusView] isFlipped]){
|
||||
if([[NSGraphicsContext currentContext] isFlipped]){
|
||||
CGAffineTransform flip={1,0,0,-1,0,0};
|
||||
|
||||
CGContextSetTextMatrix(cgContext,flip);
|
||||
|
@ -154,7 +154,7 @@ void NSDrawButton(NSRect rect,NSRect clipRect) {
|
||||
for(i=0;i<7;i++)
|
||||
rects[i]=rect;
|
||||
|
||||
if([[NSView focusView] isFlipped]){
|
||||
if([[NSGraphicsContext currentContext] isFlipped]){
|
||||
colors[0]=[NSColor blackColor];
|
||||
rects[0].origin.y+=rect.size.height-1;
|
||||
rects[0].size.height=1;
|
||||
@ -237,7 +237,7 @@ void NSDrawGrayBezel(NSRect rect, NSRect clipRect) {
|
||||
for(i=0; i<4; i++)
|
||||
rects[i]=rect;
|
||||
|
||||
if ([[NSView focusView] isFlipped]) {
|
||||
if ([[NSGraphicsContext currentContext] isFlipped]) {
|
||||
colors[0]=[NSColor whiteColor];
|
||||
colors[1]=[NSColor controlShadowColor];
|
||||
rects[1].size.width-=1;
|
||||
@ -283,7 +283,7 @@ void NSDrawWhiteBezel(NSRect rect, NSRect clipRect) {
|
||||
for(i=0; i<7; i++)
|
||||
rects[i]=rect;
|
||||
|
||||
if ([[NSView focusView] isFlipped]) {
|
||||
if ([[NSGraphicsContext currentContext] isFlipped]) {
|
||||
colors[0]=[NSColor whiteColor];
|
||||
colors[1]=[NSColor controlShadowColor];
|
||||
rects[1].size.height=1;
|
||||
@ -361,7 +361,7 @@ void NSDrawGroove(NSRect rect, NSRect clipRect) {
|
||||
for(i=0; i<4; i++)
|
||||
rects[i]=rect;
|
||||
|
||||
if ([[NSView focusView] isFlipped]) {
|
||||
if ([[NSGraphicsContext currentContext] isFlipped]) {
|
||||
colors[0]=[NSColor controlShadowColor];
|
||||
colors[1]=[NSColor whiteColor];
|
||||
rects[1].origin.x+=1;
|
||||
|
@ -34,7 +34,7 @@ void NSInterfaceDrawHighlightedButton(NSRect rect,NSRect clipRect) {
|
||||
for(i=0;i<7;i++)
|
||||
rects[i]=rect;
|
||||
|
||||
if([[NSView focusView] isFlipped]){
|
||||
if([[NSGraphicsContext currentContext] isFlipped]){
|
||||
colors[0]=[NSColor blackColor];
|
||||
rects[0].origin.y+=rect.size.height-1;
|
||||
rects[0].size.height=1;
|
||||
@ -164,7 +164,7 @@ void NSInterfaceDrawBrowserHeader(NSRect rect,NSRect clipRect) {
|
||||
for (i = 0; i < 3; ++i)
|
||||
rects[i]=rect;
|
||||
|
||||
if ([[NSView focusView] isFlipped]) {
|
||||
if ([[NSGraphicsContext currentContext] isFlipped]) {
|
||||
colors[0] = [NSColor controlShadowColor];
|
||||
colors[1] = [NSColor whiteColor];
|
||||
rects[1].origin.x+=1;
|
||||
|
@ -740,7 +740,7 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
NSRange characterRange=[self characterRangeForGlyphRange:glyphRange actualGlyphRange:NULL];
|
||||
unsigned location=characterRange.location;
|
||||
unsigned limit=NSMaxRange(characterRange);
|
||||
BOOL isFlipped=[[NSView focusView] isFlipped];
|
||||
BOOL isFlipped=[[NSGraphicsContext currentContext] isFlipped];
|
||||
float usedHeight=[self usedRectForTextContainer:container].size.height;
|
||||
|
||||
while(location<limit){
|
||||
@ -781,7 +781,7 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
NSColor *selectedColor=[[textView selectedTextAttributes] objectForKey:NSForegroundColorAttributeName];
|
||||
|
||||
NSTextContainer *container=[self textContainerForGlyphAtIndex:glyphRange.location effectiveRange:&glyphRange];
|
||||
BOOL isFlipped=[[NSView focusView] isFlipped];
|
||||
BOOL isFlipped=[[NSGraphicsContext currentContext] isFlipped];
|
||||
float usedHeight=[self usedRectForTextContainer:container].size.height;
|
||||
|
||||
if(selectedColor==nil)
|
||||
|
Loading…
Reference in New Issue
Block a user