Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 20:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added better tracking

Browse Source
This commit is contained in:
dcone%netscape.com 1998-09-02 21:46:53 +00:00
parent dd54dd6174
commit 97616613d0
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
widget/src/mac/nsButton.cpp
View File

@ -26,6 +26,7 @@
#include "nsUnitConversion.h"
#include <Controls.h>
#include <quickdraw.h>
#define DBG 0
@ -37,6 +38,7 @@
nsButton::nsButton(nsISupports *aOuter) : nsWindow(aOuter)
{
strcpy(gInstanceClassName, "nsButton");
mWidgetArmed = PR_FALSE;
}
@ -127,15 +129,15 @@ void nsButton::Create(nsIWidget *aParent,
Rect r;
nsRectToMacRect(aRect,r);
mControl = NewControl ( window, &r, title, visible,
initialValue, minValue, maxValue,
ctrlType, (long)this);
//mControl = NewControl ( window, &r, title, visible,
//initialValue, minValue, maxValue,
//ctrlType, (long)this);
mWindowRegion = NewRgn();
SetRectRgn(mWindowRegion,aRect.x,aRect.y,aRect.x+aRect.width,aRect.y+aRect.height);
if (DBG) fprintf(stderr, "Button 0x%x this 0x%x\n", mControl, this);
//if (DBG) fprintf(stderr, "Button 0x%x this 0x%x\n", mControl, this);
// save the event callback function
mEventCallback = aHandleEventFunction;
@ -200,11 +202,8 @@ void nsButton::StringToStr255(const nsString& aText, Str255& aStr255)
memcpy(&aStr255[1],buffer,len);
aStr255[0] = len;
}
//-------------------------------------------------------------------------
//
// Set this button label
@ -212,13 +211,13 @@ void nsButton::StringToStr255(const nsString& aText, Str255& aStr255)
//-------------------------------------------------------------------------
void nsButton::SetLabel(const nsString& aText)
{
NS_ASSERTION(mControl != nsnull,"Control must not be null");
if (mControl != nsnull)
{
Str255 s;
StringToStr255(aText,s);
SetControlTitle(mControl,s);
}
//if (mControl != nsnull)
//{
StringToStr255(aText,mLabel);
//SetControlTitle(mControl,s);
//}
}
@ -325,11 +324,13 @@ PRBool result;
void
nsButton::DrawWidget(PRBool aMouseInside)
{
PRInt16 width,x,y;
nsRect therect;
Rect macrect;
GrafPtr theport;
RGBColor blackcolor = {0,0,0};
RgnHandle thergn;
//FontInfo fi;
GetPort(&theport);
@ -343,9 +344,23 @@ RgnHandle thergn;
::RGBForeColor(&blackcolor);
::EraseRoundRect(&macrect,10,10);
::PenSize(3,3);
::PenSize(1,1);
::FrameRoundRect(&macrect,10,10);
width = ::StringWidth(mLabel);
x = (macrect.left+macrect.right)/2 - (width/2);
::TextFont(0);
::TextSize(12);
::TextFace(bold);
//::GetFontInfo(&fi);
//height = fi.ascent;
//height = 6;
y = (macrect.top+macrect.bottom)/2 + 6;
::MoveTo(x,y);
::DrawString(mLabel);
if(mMouseDownInButton && aMouseInside)
::InvertRoundRect(&macrect,10,10);

4
widget/src/mac/nsButton.h
View File

@ -62,7 +62,7 @@ public:
// Mac specific methods
void LocalToWindowCoordinate(nsPoint& aPoint);
void LocalToWindowCoordinate(nsRect& aRect);
ControlHandle GetControl() { return mControl; }
//ControlHandle GetControl() { return mControl; }
// Overriden from nsWindow
@ -98,7 +98,7 @@ private:
AggButton mAggWidget;
friend class AggButton;
ControlHandle mControl;
Str255 mLabel;
PRBool mMouseDownInButton;
PRBool mWidgetArmed;