Menu
▾
▴
SF.net SVN: frontierkernel: [1311] Frontier/trunk/Common/source
|
From: <has...@us...> - 2006-04-19 08:28:44
|
Revision: 1311 Author: hasseily Date: 2006-04-19 01:28:14 -0700 (Wed, 19 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1311&view=rev Log Message: ----------- Cosmetic cleanup of code that uses obsolete icon drawing constants such as atVerticalCenter. Added a few comments as well. Modified Paths: -------------- Frontier/trunk/Common/IOAToolkit/ioaicon.c Frontier/trunk/Common/source/about.c Frontier/trunk/Common/source/claylinelayout.c Frontier/trunk/Common/source/icon.c Frontier/trunk/Common/source/opicons.c Frontier/trunk/Common/source/tabledisplay.c Frontier/trunk/FrontierSDK/Toolkits/AppletToolkit/Headers/appleticons.h Modified: Frontier/trunk/Common/IOAToolkit/ioaicon.c =================================================================== --- Frontier/trunk/Common/IOAToolkit/ioaicon.c 2006-04-19 06:21:33 UTC (rev 1310) +++ Frontier/trunk/Common/IOAToolkit/ioaicon.c 2006-04-19 08:28:14 UTC (rev 1311) @@ -232,7 +232,7 @@ (**h).haslabel = true; - (**h).align = atVerticalCenter + atHorizontalCenter; + (**h).align = kAlignAbsoluteCenter; *hdata = h; Modified: Frontier/trunk/Common/source/about.c =================================================================== --- Frontier/trunk/Common/source/about.c 2006-04-19 06:21:33 UTC (rev 1310) +++ Frontier/trunk/Common/source/about.c 2006-04-19 08:28:14 UTC (rev 1311) @@ -279,7 +279,7 @@ if (GetIconRefFromFile (&programfspec, &iconref, &label) == noErr) { - ec = PlotIconRef (&r, atVerticalCenter + atHorizontalCenter, flpressed? kTransformSelected : 0, kIconServicesNormalUsageFlag, iconref); + ec = PlotIconRef (&r, kAlignAbsoluteCenter, flpressed? kTransformSelected : 0, kIconServicesNormalUsageFlag, iconref); ReleaseIconRef (iconref); @@ -288,7 +288,7 @@ } /*if*/ #endif - ploticonresource (&rcicn, atVerticalCenter + atHorizontalCenter, flpressed? kTransformSelected : 0, idfrontiericon); + ploticonresource (&rcicn, kAlignAbsoluteCenter, flpressed? kTransformSelected : 0, idfrontiericon); } /*ccdrawfrontiericon*/ Modified: Frontier/trunk/Common/source/claylinelayout.c =================================================================== --- Frontier/trunk/Common/source/claylinelayout.c 2006-04-19 06:21:33 UTC (rev 1310) +++ Frontier/trunk/Common/source/claylinelayout.c 2006-04-19 08:28:14 UTC (rev 1311) @@ -931,7 +931,7 @@ transform = 0x4000; #ifdef MACVERSION - ploticonresource ((Rect *) iconrect, atVerticalCenter + atHorizontalCenter, transform, iconnum); + ploticonresource ((Rect *) iconrect, kAlignAbsoluteCenter, transform, iconnum); #endif #ifdef WIN95VERSION Modified: Frontier/trunk/Common/source/icon.c =================================================================== --- Frontier/trunk/Common/source/icon.c 2006-04-19 06:21:33 UTC (rev 1310) +++ Frontier/trunk/Common/source/icon.c 2006-04-19 08:28:14 UTC (rev 1311) @@ -74,6 +74,8 @@ 1.0b21 dmb: try geting normal b&w icon if all else fails 5.0a8 dmb: use srccopy, not srcand for win blits + + Note that the Windows version does NOT use the transform parameter */ #ifdef MACVERSION Modified: Frontier/trunk/Common/source/opicons.c =================================================================== --- Frontier/trunk/Common/source/opicons.c 2006-04-19 06:21:33 UTC (rev 1310) +++ Frontier/trunk/Common/source/opicons.c 2006-04-19 08:28:14 UTC (rev 1311) @@ -92,20 +92,24 @@ void opdrawheadicon (short iconnum, const Rect *r, boolean flselected) { + /* + This function draws the triangle icons inside outlines (but not root tables). + Root table triangles are in tabledisplay.c, browserdrawnodeicon() + */ - short transform = 0; + operaserect (*r); +#ifdef MACVERSION + short transform = kTransformNone; + if (flselected) - transform = 0x4000; + transform = kTransformSelected; - operaserect (*r); - -#ifdef MACVERSION - ploticonresource ((Rect *) r, atVerticalCenter + atHorizontalCenter, transform, iconnum); + ploticonresource ((Rect *) r, kAlignCenterRight, transform, iconnum); #endif #ifdef WIN95VERSION - ploticonresource (r, 0, transform, iconnum); + ploticonresource (r, 0, 0, iconnum); #endif } /*opdrawheadicon*/ @@ -115,7 +119,7 @@ short transform = 0; if (flselected) - transform = 0x4000; + transform = kTransformSelected; operaserect (*r); Modified: Frontier/trunk/Common/source/tabledisplay.c =================================================================== --- Frontier/trunk/Common/source/tabledisplay.c 2006-04-19 06:21:33 UTC (rev 1310) +++ Frontier/trunk/Common/source/tabledisplay.c 2006-04-19 08:28:14 UTC (rev 1311) @@ -1083,22 +1083,27 @@ void browserdrawnodeicon (const Rect *r, boolean flhighlighted, hdlheadrecord hnode) { + /* + This function draws the triangle icons inside tables (but not outlines). + Outline triangles are in opicons.c, opdrawheadicon() + */ + tybrowserinfo browserinfo; + browsergetrefcon (hnode, &browserinfo); + +#ifdef MACVERSION + short transform = kTransformNone; - tybrowserinfo browserinfo; - short transform = 0; - long align = 0; - if (flhighlighted) - transform = 0x4000; + transform = kTransformSelected; -#ifdef MACVERSION - align = atVerticalCenter + atHorizontalCenter; + ploticonresource (r, kAlignAbsoluteCenter, transform, opgetheadicon (hnode)); #endif + +#ifdef WIN95VERSION + ploticonresource (r, 0, 0, opgetheadicon (hnode)); +#endif - browsergetrefcon (hnode, &browserinfo); - ploticonresource (r, align, transform, opgetheadicon (hnode)); - #if 0 transform += ttLabel [browserinfo.ixlabel]; /*color it according to the file's label*/ Modified: Frontier/trunk/FrontierSDK/Toolkits/AppletToolkit/Headers/appleticons.h =================================================================== --- Frontier/trunk/FrontierSDK/Toolkits/AppletToolkit/Headers/appleticons.h 2006-04-19 06:21:33 UTC (rev 1310) +++ Frontier/trunk/FrontierSDK/Toolkits/AppletToolkit/Headers/appleticons.h 2006-04-19 08:28:14 UTC (rev 1311) @@ -9,13 +9,13 @@ -#define atNone 0x0 -#define atVerticalCenter 0x1 -#define atTop 0x2 -#define atBottom 0x3 -#define atHorizontalCenter 0x4 -#define atLeft 0x8 -#define atRight 0xC +#define atNone 0x00 +#define atVerticalCenter 0x01 +#define atTop 0x02 +#define atBottom 0x03 +#define atHorizontalCenter 0x04 +#define atLeft 0x08 +#define atRight 0x0C extern unsigned short ttLabel [8]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
