Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

support toolbarBitmapPosition property.

Browse Source
This commit is contained in:
pinkerton%netscape.com 1998-10-05 22:44:47 +00:00
parent 5cca4d5199
commit 736ac30e7f
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cmd/macfe/gui/CRDFToolbarItem.cp
View File

@ -63,10 +63,12 @@ CRDFToolbarItem :: ~CRDFToolbarItem ( )
CRDFPushButton :: CRDFPushButton ( HT_Resource inNode )
: CRDFToolbarItem(inNode), mTitleTraitsID(130), mCurrentMode(eTOOLBAR_TEXT_AND_ICONS),
mMouseInFrame(false), mTrackInside(false), mGraphicPadPixels(5), mTitlePadPixels(5),
mTitleAlignment(kAlignCenterBottom), mGraphicAlignment(kAlignCenterTop),
mOvalWidth(8), mOvalHeight(8)
{
// figure out icon and text placement depending on the toolbarBitmapPosition property in HT. The
// first param is the alignment when the icon is one top, the 2nd when the icon is on the side.
mTitleAlignment = CalcAlignment(kAlignCenterBottom, kAlignCenterRight);
mGraphicAlignment = CalcAlignment(kAlignCenterTop, kAlignCenterLeft);
}
@ -75,6 +77,29 @@ CRDFPushButton :: ~CRDFPushButton ( )
}
//
// CalcAlignment
//
// Compute the FE alignment of a specific HT property. If HT specifies the icon is on top, use |inTopAlignment|,
// otherwise use |inSideAlignment|. This property is a view-level property so we need to pass in the top node
// of the view, not the node associated with this button. As a result, all buttons on a given toolbar MUST
// have the same alignment. You cannot have one button with the icon on top and another with the icons on the side
// in the same toolbar.
//
UInt32
CRDFPushButton :: CalcAlignment ( UInt32 inTopAlignment, Uint32 inSideAlignment ) const
{
Uint32 retVal = inSideAlignment;
char* value = NULL;
PRBool success = HT_GetTemplateData ( HT_TopNode(HT_GetView(HTNode())), gNavCenter->toolbarBitmapPosition, HT_COLUMN_STRING, &value );
if ( success && value ) {
if ( strcmp(value, "top") == 0 )
retVal = inTopAlignment;
}
return retVal;
} // CalcAlignment
//
// CalcTitleFrame
@ -117,6 +142,7 @@ CRDFPushButton :: CalcTitleFrame ( )
//
// CalcGraphicFrame
//
// Precompute where the graphic should go.
//
void
CRDFPushButton :: CalcGraphicFrame ( )
@ -318,13 +344,19 @@ CRDFPushButton :: DrawButtonHilited ( )
{
Rect frame = mCachedButtonFrame;
::InsetRect(&frame, 1, 1);
// Do we need to do this very slight darkening?
UGraphicGizmos::LowerRoundRectColorVolume(frame, 4, 4, UGAAppearance::sGASevenGrayLevels);
::InsetRect(&frame, -1, -1);
// UGraphicGizmos::LowerRoundRectColorVolume(frame, 4, 4, UGAAppearance::sGASevenGrayLevels);
}
// Now draw GA pressed button bevel
UGAAppearance::DrawGAButtonPressedBevelTint(mCachedButtonFrame);
if ( URDFUtilities::SetupBackgroundColor(HTNode(), gNavCenter->viewPressedColor, kThemeIconLabelBackgroundBrush) ) {
Rect frame = mCachedButtonFrame;
::InsetRect(&frame, 1, 1);
::EraseRect(&frame);
}
else
UGAAppearance::DrawGAButtonPressedBevelTint(mCachedButtonFrame);
}

3
cmd/macfe/gui/CRDFToolbarItem.h
View File

@ -121,12 +121,15 @@ protected:
virtual void MouseWithin ( Point inPortPt, const EventRecord &inMacEvent);
virtual void MouseLeave(void);
// handle control tracking
virtual void HotSpotAction(short /* inHotSpot */, Boolean inCurrInside, Boolean inPrevInside) ;
bool IsMouseInFrame ( ) const { return mMouseInFrame; } ;
private:
UInt32 CalcAlignment ( UInt32 inTopAlignment, Uint32 inSideAlignment ) const;
StRegion mButtonMask;
Rect mCachedButtonFrame;
Rect mCachedTitleFrame;