qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 08:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hopefully fix the flush control and second screen placement.

Browse source
This commit is contained in:
Bill Currie 2010-09-24 23:17:25 +09:00
parent ec98bb3b93
commit c1fac2cc8a
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/Forge/Bundles/MapEdit/QuakeEd.m
View file

@ -244,8 +244,8 @@ instance draw the brush after each flush
return self; // don't lock focus before nib is return self; // don't lock focus before nib is
// finished loading // finished loading
// if (_flushDisabled) if (_disableFlushWindow)
// return self; return self;
[cameraview_i lockFocus]; [cameraview_i lockFocus];
if (clearinstance) { if (clearinstance) {
@ -378,9 +378,11 @@ App delegate methods
// go to my second monitor // go to my second monitor
screens =[NSScreen screens]; screens =[NSScreen screens];
if ([screens count] == 2) { if ([screens count] == 2) {
NSRect frm;
scrn =[screens objectAtIndex:1]; scrn =[screens objectAtIndex:1];
// XXX [self moveTopLeftTo:0 : [scrn frame].size.height frm = [scrn frame];
// XXX screen:scrn]; [self setFrameTopLeftPoint: NSMakePoint (frm.origin.x,
frm.size.height)];
} }
[self makeKeyAndOrderFront:self]; [self makeKeyAndOrderFront:self];

4
tools/Forge/Bundles/MapEdit/XYView.m
View file

@ -171,6 +171,7 @@ initWithFrame:
// redisplay everything // redisplay everything
// size this view // size this view
[quakeed_i disableFlushWindow];
[self setFrame:sframe bounds:bounds scale:NSMakeSize (scale, scale)]; [self setFrame:sframe bounds:bounds scale:NSMakeSize (scale, scale)];
// scroll the clip view // scroll the clip view
@ -179,6 +180,7 @@ initWithFrame:
[cv setBoundsOrigin:pt]; [cv setBoundsOrigin:pt];
[scrollview_i reflectScrolledClipView: cv]; [scrollview_i reflectScrolledClipView: cv];
[quakeed_i enableFlushWindow];
[scrollview_i display]; [scrollview_i display];
return self; return self;
} }
@ -248,8 +250,10 @@ If realbounds has shrunk, nothing will change.
sframe.size.height *= scale; sframe.size.height *= scale;
// size this view // size this view
[quakeed_i disableFlushWindow];
[self setFrame:sframe bounds:bounds scale:NSMakeSize (scale, scale)]; [self setFrame:sframe bounds:bounds scale:NSMakeSize (scale, scale)];
[quakeed_i enableFlushWindow];
[scrollview_i reflectScrolledClipView:[scrollview_i contentView]]; [scrollview_i reflectScrolledClipView:[scrollview_i contentView]];
return self; return self;
} }

4
tools/Forge/Bundles/MapEdit/ZView.m
View file

@ -126,6 +126,7 @@ setOrigin:scale:
sframe.size.height *= scale; sframe.size.height *= scale;
// size this view // size this view
[quakeed_i disableFlushWindow];
[self setFrame:sframe bounds:bounds scale:NSMakeSize (1, scale)]; [self setFrame:sframe bounds:bounds scale:NSMakeSize (1, scale)];
// scroll and scale the clip view // scroll and scale the clip view
@ -133,6 +134,7 @@ setOrigin:scale:
pt.y *= scale; pt.y *= scale;
[_super_view setBoundsOrigin: pt]; [_super_view setBoundsOrigin: pt];
[quakeed_i enableFlushWindow];
[zscrollview_i display]; [zscrollview_i display];
return self; return self;
@ -263,10 +265,12 @@ If realbounds has shrunk, nothing will change.
sframe.size.height *= scale; sframe.size.height *= scale;
// size this view // size this view
[quakeed_i disableFlushWindow];
[self setFrame:sframe bounds:bounds scale:NSMakeSize (1, scale)]; [self setFrame:sframe bounds:bounds scale:NSMakeSize (1, scale)];
[[_super_view superview] reflectScrolledClipView: cv]; [[_super_view superview] reflectScrolledClipView: cv];
[quakeed_i enableFlushWindow];
[[zscrollview_i verticalScroller] display]; [[zscrollview_i verticalScroller] display];
return self; return self;