qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix setBasePos to get the pos from a view. 

This fixes Group for the Point/Size/Rect change.
This commit is contained in:
Bill Currie 2010-11-17 18:59:39 +09:00
parent 67beaf4487
commit c460e3c979
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruamoko/gui/Group.r
View File

@ -41,7 +41,8 @@
{ {
[super setBasePos:pos]; [super setBasePos:pos];
local Point point = {xabs, yabs}; local Point point = {xabs, yabs};
[views makeObjectsPerformSelector:@selector (setBasePos:) withObject:point]; local SEL sel = @selector (setBasePosFromView:);
[views makeObjectsPerformSelector:sel withObject:self];
} }
- (void) draw - (void) draw

11
ruamoko/gui/View.r
View File

@ -38,14 +38,21 @@
return flags & 1; return flags & 1;
} }
- (Point) basePos
{
return makePoint (xabs, yabs);
}
- (void) setBasePos: (integer) x y: (integer) y - (void) setBasePos: (integer) x y: (integer) y
{ {
local Point point = {x, y}; local Point point = {x, y};
[self setBasePos:point]; xabs = xpos + x;
yabs = ypos + y;
} }
- (void) setBasePos: (Point)pos - (void) setBasePosFromView: (View) view
{ {
Point pos = [view basePos];
xabs = xpos + pos.x; xabs = xpos + pos.x;
yabs = ypos + pos.y; yabs = ypos + pos.y;
} }

2
ruamoko/include/gui/View.h
View File

@ -20,7 +20,7 @@
- (id) canFocus: (integer)cf; - (id) canFocus: (integer)cf;
- (integer) canFocus; - (integer) canFocus;
- (void) setBasePos: (integer)x y: (integer)y; - (void) setBasePos: (integer)x y: (integer)y;
- (void) setBasePos: (Point)pos; - (void) setBasePosFromView: (View)view;
- (void) draw; - (void) draw;
- (integer) keyEvent:(integer)key unicode:(integer)unicode down:(integer)down; - (integer) keyEvent:(integer)key unicode:(integer)unicode down:(integer)down;