Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tooltip displaying correct background under OSX , antialiased system font used

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-05-11 06:51:15 +00:00
parent 118f012e37
commit 7eb67c0012
2 changed files with 148 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/mac/carbon/tooltip.cpp
View File

@@ -108,7 +108,7 @@ void wxToolTip::SetTip( const wxString &tip )
void wxToolTip::SetWindow( wxWindow *win ) void wxToolTip::SetWindow( wxWindow *win )
{ {
m_window = win; m_window = win ;
} }
void wxToolTip::Enable( bool flag ) void wxToolTip::Enable( bool flag )
@@ -185,14 +185,14 @@ wxMacToolTip::wxMacToolTip()
m_timer = NULL ; m_timer = NULL ;
} }
void wxMacToolTip::Setup( WindowRef window , wxString text , wxPoint localPosition ) void wxMacToolTip::Setup( WindowRef win , wxString text , wxPoint localPosition )
{ {
m_mark++ ; m_mark++ ;
Clear() ; Clear() ;
m_position = localPosition ; m_position = localPosition ;
m_label = wxMacMakeMacStringFromPC( text ) ; m_label = wxMacMakeMacStringFromPC( text ) ;
m_window = window ; m_window =win;
s_ToolTipWindowRef = window ; s_ToolTipWindowRef = m_window ;
m_backpict = NULL ; m_backpict = NULL ;
if ( m_timer ) if ( m_timer )
delete m_timer ; delete m_timer ;
@@ -229,11 +229,20 @@ void wxMacToolTip::Draw()
{ {
wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) ); wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) );
bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
m_shown = true ; m_shown = true ;
TextFont( kFontIDGeneva ) ; FontFamilyID fontId ;
TextSize( 10 ) ; Str255 fontName ;
TextFace( 0 ) ; SInt16 fontSize ;
Style fontStyle ;
GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
GetFNum( fontName, &fontId );
TextFont( fontId ) ;
TextSize( fontSize ) ;
TextFace( fontStyle ) ;
FontInfo fontInfo; FontInfo fontInfo;
::GetFontInfo(&fontInfo); ::GetFontInfo(&fontInfo);
short lineh = fontInfo.ascent + fontInfo.descent + fontInfo.leading; short lineh = fontInfo.ascent + fontInfo.descent + fontInfo.leading;
@@ -271,6 +280,8 @@ void wxMacToolTip::Draw()
m_rect.left = m_position.x + kTipOffset; m_rect.left = m_position.x + kTipOffset;
m_rect.top = m_position.y + kTipOffset; m_rect.top = m_position.y + kTipOffset;
m_rect.right = m_rect.left + width + 2 * kTipBorder; m_rect.right = m_rect.left + width + 2 * kTipBorder;
if ( useDrawThemeText )
m_rect.right += kTipBorder ;
m_rect.bottom = m_rect.top + height + 2 * kTipBorder; m_rect.bottom = m_rect.top + height + 2 * kTipBorder;
ClipRect( &m_rect ) ; ClipRect( &m_rect ) ;
BackColor( whiteColor ) ; BackColor( whiteColor ) ;
@@ -285,32 +296,77 @@ void wxMacToolTip::Draw()
NULL); NULL);
ClosePicture(); ClosePicture();
PenNormal() ; PenNormal() ;
SetThemeBackground(kThemeBrushNotificationWindowBackground,32,true) ;
SetThemeTextColor(kThemeTextColorNotification,32,true) ; RGBColor tooltipbackground = { 0xFFFF , 0xFFFF , 0xC000 } ;
EraseRect( &m_rect ) ; BackColor( whiteColor ) ;
RGBForeColor( &tooltipbackground ) ;
PaintRect( &m_rect ) ;
ForeColor(blackColor ) ;
FrameRect( &m_rect ) ; FrameRect( &m_rect ) ;
SetThemeTextColor(kThemeTextColorNotification,wxDisplayDepth(),true) ;
::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder); ::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder);
i = 0 ; i = 0 ;
laststop = 0 ; laststop = 0 ;
height = 0 ; height = 0 ;
while( i < length ) while( i < length )
{ {
if( text[i] == 13 || text[i] == 10) if( text[i] == 13 || text[i] == 10)
{ {
::DrawText( text , laststop , i - laststop ) ; if ( useDrawThemeText )
height += lineh ; {
::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder + height ); Rect frame ;
frame.top = m_rect.top + kTipBorder + height ;
frame.left = m_rect.left + kTipBorder ;
frame.bottom = frame.top + 1000 ;
frame.right = frame.left + 1000 ;
CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
::DrawThemeTextBox( mString,
kThemeCurrentPortFont,
kThemeStateActive,
true,
&frame,
teJustLeft,
nil );
CFRelease( mString ) ;
height += lineh ;
}
else
{
::DrawText( text , laststop , i - laststop ) ;
height += lineh ;
::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder + height );
}
laststop = i+1 ; laststop = i+1 ;
} }
i++ ; i++ ;
} }
if ( useDrawThemeText )
::DrawText( text , laststop , i - laststop ) ; {
Rect frame ;
frame.top = m_rect.top + kTipBorder + height ;
frame.left = m_rect.left + kTipBorder ;
frame.bottom = frame.top + 1000 ;
frame.right = frame.left + 1000 ;
CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ;
::DrawThemeTextBox( mString,
kThemeCurrentPortFont,
kThemeStateActive,
true,
&frame,
teJustLeft,
nil );
CFRelease( mString ) ;
}
else
{
::DrawText( text , laststop , i - laststop ) ;
}
::TextMode( srcOr ) ; ::TextMode( srcOr ) ;
// DrawText( m_label , 0 , m_label.Length() ) ; }
}
} }
} }

92
src/mac/tooltip.cpp
View File

@@ -108,7 +108,7 @@ void wxToolTip::SetTip( const wxString &tip )
void wxToolTip::SetWindow( wxWindow *win ) void wxToolTip::SetWindow( wxWindow *win )
{ {
m_window = win; m_window = win ;
} }
void wxToolTip::Enable( bool flag ) void wxToolTip::Enable( bool flag )
@@ -185,14 +185,14 @@ wxMacToolTip::wxMacToolTip()
m_timer = NULL ; m_timer = NULL ;
} }
void wxMacToolTip::Setup( WindowRef window , wxString text , wxPoint localPosition ) void wxMacToolTip::Setup( WindowRef win , wxString text , wxPoint localPosition )
{ {
m_mark++ ; m_mark++ ;
Clear() ; Clear() ;
m_position = localPosition ; m_position = localPosition ;
m_label = wxMacMakeMacStringFromPC( text ) ; m_label = wxMacMakeMacStringFromPC( text ) ;
m_window = window ; m_window =win;
s_ToolTipWindowRef = window ; s_ToolTipWindowRef = m_window ;
m_backpict = NULL ; m_backpict = NULL ;
if ( m_timer ) if ( m_timer )
delete m_timer ; delete m_timer ;
@@ -229,11 +229,20 @@ void wxMacToolTip::Draw()
{ {
wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) ); wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) );
bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
m_shown = true ; m_shown = true ;
TextFont( kFontIDGeneva ) ; FontFamilyID fontId ;
TextSize( 10 ) ; Str255 fontName ;
TextFace( 0 ) ; SInt16 fontSize ;
Style fontStyle ;
GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
GetFNum( fontName, &fontId );
TextFont( fontId ) ;
TextSize( fontSize ) ;
TextFace( fontStyle ) ;
FontInfo fontInfo; FontInfo fontInfo;
::GetFontInfo(&fontInfo); ::GetFontInfo(&fontInfo);
short lineh = fontInfo.ascent + fontInfo.descent + fontInfo.leading; short lineh = fontInfo.ascent + fontInfo.descent + fontInfo.leading;
@@ -271,6 +280,8 @@ void wxMacToolTip::Draw()
m_rect.left = m_position.x + kTipOffset; m_rect.left = m_position.x + kTipOffset;
m_rect.top = m_position.y + kTipOffset; m_rect.top = m_position.y + kTipOffset;
m_rect.right = m_rect.left + width + 2 * kTipBorder; m_rect.right = m_rect.left + width + 2 * kTipBorder;
if ( useDrawThemeText )
m_rect.right += kTipBorder ;
m_rect.bottom = m_rect.top + height + 2 * kTipBorder; m_rect.bottom = m_rect.top + height + 2 * kTipBorder;
ClipRect( &m_rect ) ; ClipRect( &m_rect ) ;
BackColor( whiteColor ) ; BackColor( whiteColor ) ;
@@ -285,32 +296,77 @@ void wxMacToolTip::Draw()
NULL); NULL);
ClosePicture(); ClosePicture();
PenNormal() ; PenNormal() ;
SetThemeBackground(kThemeBrushNotificationWindowBackground,32,true) ;
SetThemeTextColor(kThemeTextColorNotification,32,true) ; RGBColor tooltipbackground = { 0xFFFF , 0xFFFF , 0xC000 } ;
EraseRect( &m_rect ) ; BackColor( whiteColor ) ;
RGBForeColor( &tooltipbackground ) ;
PaintRect( &m_rect ) ;
ForeColor(blackColor ) ;
FrameRect( &m_rect ) ; FrameRect( &m_rect ) ;
SetThemeTextColor(kThemeTextColorNotification,wxDisplayDepth(),true) ;
::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder); ::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder);
i = 0 ; i = 0 ;
laststop = 0 ; laststop = 0 ;
height = 0 ; height = 0 ;
while( i < length ) while( i < length )
{ {
if( text[i] == 13 || text[i] == 10) if( text[i] == 13 || text[i] == 10)
{ {
::DrawText( text , laststop , i - laststop ) ; if ( useDrawThemeText )
height += lineh ; {
::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder + height ); Rect frame ;
frame.top = m_rect.top + kTipBorder + height ;
frame.left = m_rect.left + kTipBorder ;
frame.bottom = frame.top + 1000 ;
frame.right = frame.left + 1000 ;
CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
::DrawThemeTextBox( mString,
kThemeCurrentPortFont,
kThemeStateActive,
true,
&frame,
teJustLeft,
nil );
CFRelease( mString ) ;
height += lineh ;
}
else
{
::DrawText( text , laststop , i - laststop ) ;
height += lineh ;
::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder + height );
}
laststop = i+1 ; laststop = i+1 ;
} }
i++ ; i++ ;
} }
if ( useDrawThemeText )
::DrawText( text , laststop , i - laststop ) ; {
Rect frame ;
frame.top = m_rect.top + kTipBorder + height ;
frame.left = m_rect.left + kTipBorder ;
frame.bottom = frame.top + 1000 ;
frame.right = frame.left + 1000 ;
CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ;
::DrawThemeTextBox( mString,
kThemeCurrentPortFont,
kThemeStateActive,
true,
&frame,
teJustLeft,
nil );
CFRelease( mString ) ;
}
else
{
::DrawText( text , laststop , i - laststop ) ;
}
::TextMode( srcOr ) ; ::TextMode( srcOr ) ;
// DrawText( m_label , 0 , m_label.Length() ) ; }
}
} }
} }