mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-10 23:32:09 +00:00
Hopefully fix the flush control and second screen placement.
This commit is contained in:
parent
ec98bb3b93
commit
c1fac2cc8a
3 changed files with 14 additions and 4 deletions
|
@ -244,8 +244,8 @@ instance draw the brush after each flush
|
|||
return self; // don't lock focus before nib is
|
||||
// finished loading
|
||||
|
||||
// if (_flushDisabled)
|
||||
// return self;
|
||||
if (_disableFlushWindow)
|
||||
return self;
|
||||
|
||||
[cameraview_i lockFocus];
|
||||
if (clearinstance) {
|
||||
|
@ -378,9 +378,11 @@ App delegate methods
|
|||
// go to my second monitor
|
||||
screens =[NSScreen screens];
|
||||
if ([screens count] == 2) {
|
||||
NSRect frm;
|
||||
scrn =[screens objectAtIndex:1];
|
||||
// XXX [self moveTopLeftTo:0 : [scrn frame].size.height
|
||||
// XXX screen:scrn];
|
||||
frm = [scrn frame];
|
||||
[self setFrameTopLeftPoint: NSMakePoint (frm.origin.x,
|
||||
frm.size.height)];
|
||||
}
|
||||
|
||||
[self makeKeyAndOrderFront:self];
|
||||
|
|
|
@ -171,6 +171,7 @@ initWithFrame:
|
|||
// redisplay everything
|
||||
|
||||
// size this view
|
||||
[quakeed_i disableFlushWindow];
|
||||
[self setFrame:sframe bounds:bounds scale:NSMakeSize (scale, scale)];
|
||||
|
||||
// scroll the clip view
|
||||
|
@ -179,6 +180,7 @@ initWithFrame:
|
|||
[cv setBoundsOrigin:pt];
|
||||
|
||||
[scrollview_i reflectScrolledClipView: cv];
|
||||
[quakeed_i enableFlushWindow];
|
||||
[scrollview_i display];
|
||||
return self;
|
||||
}
|
||||
|
@ -248,8 +250,10 @@ If realbounds has shrunk, nothing will change.
|
|||
sframe.size.height *= scale;
|
||||
|
||||
// size this view
|
||||
[quakeed_i disableFlushWindow];
|
||||
[self setFrame:sframe bounds:bounds scale:NSMakeSize (scale, scale)];
|
||||
|
||||
[quakeed_i enableFlushWindow];
|
||||
[scrollview_i reflectScrolledClipView:[scrollview_i contentView]];
|
||||
return self;
|
||||
}
|
||||
|
|
|
@ -126,6 +126,7 @@ setOrigin:scale:
|
|||
sframe.size.height *= scale;
|
||||
|
||||
// size this view
|
||||
[quakeed_i disableFlushWindow];
|
||||
[self setFrame:sframe bounds:bounds scale:NSMakeSize (1, scale)];
|
||||
|
||||
// scroll and scale the clip view
|
||||
|
@ -133,6 +134,7 @@ setOrigin:scale:
|
|||
pt.y *= scale;
|
||||
[_super_view setBoundsOrigin: pt];
|
||||
|
||||
[quakeed_i enableFlushWindow];
|
||||
[zscrollview_i display];
|
||||
|
||||
return self;
|
||||
|
@ -263,10 +265,12 @@ If realbounds has shrunk, nothing will change.
|
|||
sframe.size.height *= scale;
|
||||
|
||||
// size this view
|
||||
[quakeed_i disableFlushWindow];
|
||||
[self setFrame:sframe bounds:bounds scale:NSMakeSize (1, scale)];
|
||||
|
||||
[[_super_view superview] reflectScrolledClipView: cv];
|
||||
|
||||
[quakeed_i enableFlushWindow];
|
||||
[[zscrollview_i verticalScroller] display];
|
||||
|
||||
return self;
|
||||
|
|
Loading…
Reference in a new issue