#pragma hdrstop
#endif
+#if wxUSE_TOOLBAR
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/app.h"
-
- #include "wx/univ/renderer.h"
#endif
+#include "wx/univ/renderer.h"
+
#include "wx/toolbar.h"
#include "wx/image.h"
class WXDLLEXPORT wxToolBarTool : public wxToolBarToolBase
{
public:
- wxToolBarTool( wxToolBarBase *tbar = (wxToolBarBase *)NULL,
- int id = wxID_SEPARATOR,
- const wxBitmap& bitmap1 = wxNullBitmap,
- const wxBitmap& bitmap2 = wxNullBitmap,
- bool toggle = FALSE,
- wxObject *clientData = (wxObject *) NULL,
- const wxString& shortHelpString = wxEmptyString,
- const wxString& longHelpString = wxEmptyString )
- : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle, clientData,
- shortHelpString, longHelpString)
+ wxToolBarTool(wxToolBar *tbar,
+ int id,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
+ wxObject *clientData,
+ const wxString& shortHelp,
+ const wxString& longHelp)
+ : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+ clientData, shortHelp, longHelp)
{
// no position yet
m_x =
// not pressed yet
m_isInverted = FALSE;
+
+ // mouse not here yet
+ m_underMouse = FALSE;
}
// is this tool pressed, even temporarily? (this is different from being
// press the tool temporarily by inverting its toggle state
void Invert() { m_isInverted = !m_isInverted; }
+
+ // Set underMouse
+ void SetUnderMouse( bool under = TRUE ) { m_underMouse = under; }
+ bool IsUnderMouse() { return m_underMouse; }
public:
// the tool position (the size is known by the toolbar itself)
private:
// TRUE if the tool is pressed
bool m_isInverted;
+
+ // TRUE if the tool is under the mouse
+ bool m_underMouse;
};
// ============================================================================
m_maxWidth =
m_maxHeight = 0;
- m_toolPressed = NULL;
- m_toolCurrent = NULL;
-
wxRenderer *renderer = GetRenderer();
SetToolBitmapSize(renderer->GetToolBarButtonSize(&m_widthSeparator));
{
}
+void wxToolBar::SetMargins(int x, int y)
+{
+ // This required for similar visual effects under
+ // native platforms and wxUniv.
+ wxToolBarBase::SetMargins( x + 3, y + 3 );
+}
+
// ----------------------------------------------------------------------------
// wxToolBar tool-related methods
// ----------------------------------------------------------------------------
// created disabled-state bitmap on demand
if ( !enable && !tool->GetDisabledBitmap().Ok() )
{
- wxImage image( tool->GetNormalBitmap() );
+ wxImage image( tool->GetNormalBitmap().ConvertToImage() );
// TODO: don't hardcode 180
unsigned char bg_red = 180;
}
}
- tool->SetDisabledBitmap( image.ConvertToBitmap() );
+ tool->SetDisabledBitmap(image);
}
RefreshTool(tool);
}
wxToolBarToolBase *wxToolBar::CreateTool(int id,
- const wxBitmap& bitmap1,
- const wxBitmap& bitmap2,
- bool toggle,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
wxObject *clientData,
- const wxString& shortHelpString,
- const wxString& longHelpString)
+ const wxString& shortHelp,
+ const wxString& longHelp)
{
- return new wxToolBarTool( this, id, bitmap1, bitmap2, toggle,
- clientData, shortHelpString, longHelpString);
+ return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+ clientData, shortHelp, longHelp);
}
wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
tool->m_x = x;
tool->m_y = y;
- *pCur += (tool->IsSeparator() ? m_widthSeparator : widthTool) + margin;
+ // TODO ugly number fiddling
+ *pCur += ( tool->IsSeparator() ? m_widthSeparator : (widthTool+2) ) + margin;
}
// calculate the total toolbar size
node;
node = node->GetNext() )
{
- wxToolBarToolBase *tool = node->GetData();
+ wxToolBarTool *tool = (wxToolBarTool*) node->GetData();
wxRect rectTool = GetToolRect(tool);
wxCoord startTool, endTool;
GetRectLimits(rectTool, &startTool, &endTool);
// we're beyond the area to redraw, nothing left to do
break;
}
-
+
+ if (tool->IsSeparator() && !HasFlag(wxTB_FLAT))
+ {
+ // Draw seperators only in flat mode
+ continue;
+ }
+
// deal with the flags
int flags = 0;
if ( tool->IsEnabled() )
{
- // the toolbars without wxTB_FLAT don't react to the mouse hovering
- if ( HasFlag(wxTB_FLAT) && (tool == m_toolCurrent) )
+ // The toolbars without wxTB_FLAT don't react to the mouse hovering
+ if ( !HasFlag(wxTB_FLAT) || tool->IsUnderMouse() )
flags |= wxCONTROL_CURRENT;
}
else // disabled tool
flags |= wxCONTROL_DISABLED;
}
- if ( tool == m_toolPressed )
- flags |= wxCONTROL_FOCUSED;
+ //if ( tool == m_toolCaptured )
+ // flags |= wxCONTROL_FOCUSED;
- if ( ((wxToolBarTool *)tool)->IsPressed() )
- flags |= wxCONTROL_PRESSED;
+ if ( tool->IsPressed() )
+ flags = wxCONTROL_PRESSED;
wxString label;
wxBitmap bitmap;
if ( !tool->IsSeparator() )
{
- label = tool->GetLabel();
+ // label = tool->GetLabel();
bitmap = tool->GetBitmap();
}
//else: leave both the label and the bitmap invalid to draw a separator
// wxToolBar actions
// ----------------------------------------------------------------------------
-void wxToolBar::Press()
-{
- wxCHECK_RET( m_toolCurrent, _T("no tool to press?") );
-
- // this is the tool whose state is going to change
- m_toolPressed = (wxToolBarTool *)m_toolCurrent;
-
- // we must toggle it regardless of whether it is a checkable tool or not,
- // so use Invert() and not Toggle() here
- m_toolPressed->Invert();
-
- RefreshTool(m_toolPressed);
-}
-
-void wxToolBar::Release()
-{
- wxCHECK_RET( m_toolPressed, _T("no tool to release?") );
-
- wxASSERT_MSG( m_toolPressed->IsInverted(), _T("release unpressed button?") );
-
- m_toolPressed->Invert();
-
- RefreshTool(m_toolPressed);
-
- // we're going to lose the mouse capture
- m_toolPressed = NULL;
-}
-
-void wxToolBar::Toggle()
+bool wxToolBar::PerformAction(const wxControlAction& action,
+ long numArg,
+ const wxString& strArg)
{
- m_toolCurrent = m_toolPressed;
-
- Release();
-
- Click();
-}
+ wxToolBarTool *tool = (wxToolBarTool*) FindById(numArg);
+
+ if ( action == wxACTION_TOOLBAR_TOGGLE )
+ {
+ PerformAction( wxACTION_BUTTON_RELEASE, numArg );
-void wxToolBar::Click()
-{
- wxCHECK_RET( m_toolCurrent, _T("no tool to click?") );
+ PerformAction( wxACTION_BUTTON_CLICK, numArg );
+ }
+ else if ( action == wxACTION_TOOLBAR_PRESS )
+ {
+ wxLogTrace(_T("toolbar"), _T("Button '%s' pressed."), tool->GetShortHelp().c_str());
+
+ tool->Invert();
- bool isToggled;
- if ( m_toolCurrent->CanBeToggled() )
+ RefreshTool( tool );
+ }
+ else if ( action == wxACTION_TOOLBAR_RELEASE )
{
- m_toolCurrent->Toggle();
+ wxLogTrace(_T("toolbar"), _T("Button '%s' released."), tool->GetShortHelp().c_str());
- RefreshTool(m_toolCurrent);
+ wxASSERT_MSG( tool->IsInverted(), _T("release unpressed button?") );
+
+ tool->Invert();
- isToggled = m_toolCurrent->IsToggled();
+ RefreshTool( tool );
}
- else // simple non-checkable tool
+ else if ( action == wxACTION_TOOLBAR_CLICK )
{
- isToggled = FALSE;
- }
+ bool isToggled;
+ if ( tool->CanBeToggled() )
+ {
+ tool->Toggle();
- OnLeftClick(m_toolCurrent->GetId(), isToggled);
-}
+ RefreshTool( tool );
-bool wxToolBar::PerformAction(const wxControlAction& action,
- long numArg,
- const wxString& strArg)
-{
- if ( action == wxACTION_TOOLBAR_TOGGLE )
- Toggle();
- else if ( action == wxACTION_TOOLBAR_PRESS )
- Press();
- else if ( action == wxACTION_TOOLBAR_RELEASE )
- Release();
- else if ( action == wxACTION_TOOLBAR_CLICK )
- Click();
+ isToggled = tool->IsToggled();
+ }
+ else // simple non-checkable tool
+ {
+ isToggled = FALSE;
+ }
+ OnLeftClick( tool->GetId(), isToggled );
+ }
else if ( action == wxACTION_TOOLBAR_ENTER )
{
- wxToolBarToolBase *toolCurrentOld = m_toolCurrent;
- m_toolCurrent = FindById((int)numArg);
-
- if ( m_toolCurrent != toolCurrentOld )
+ wxCHECK_MSG( tool, FALSE, _T("no tool to enter?") );
+
+ if ( HasFlag(wxTB_FLAT) && tool->IsEnabled() )
{
- // the appearance of the current tool only changes for the flat
- // toolbars
- if ( HasFlag(wxTB_FLAT) )
- {
- // and only if the tool was/is enabled
- if ( toolCurrentOld && toolCurrentOld->IsEnabled() )
- RefreshTool(toolCurrentOld);
-
- if ( m_toolCurrent )
- {
- if ( m_toolCurrent->IsEnabled() )
- RefreshTool(m_toolCurrent);
- }
- else
- {
- wxFAIL_MSG( _T("no current tool in wxACTION_TOOLBAR_ENTER?") );
- }
- }
+ tool->SetUnderMouse( TRUE );
+
+ if ( !tool->IsToggled() )
+ RefreshTool( tool );
}
}
else if ( action == wxACTION_TOOLBAR_LEAVE )
{
- if ( m_toolCurrent )
+ wxCHECK_MSG( tool, FALSE, _T("no tool to leave?") );
+
+ if ( HasFlag(wxTB_FLAT) && tool->IsEnabled() )
{
- wxToolBarToolBase *toolCurrentOld = m_toolCurrent;
- m_toolCurrent = NULL;
-
- RefreshTool(toolCurrentOld);
+ tool->SetUnderMouse( FALSE );
+
+ if ( !tool->IsToggled() )
+ RefreshTool( tool );
}
}
else
// ============================================================================
wxStdToolbarInputHandler::wxStdToolbarInputHandler(wxInputHandler *handler)
- : wxStdButtonInputHandler(handler)
+ : wxStdInputHandler(handler)
{
+ m_winCapture = NULL;
+ m_toolCapture = NULL;
+ m_toolLast = NULL;
}
bool wxStdToolbarInputHandler::HandleKey(wxInputConsumer *consumer,
return wxStdInputHandler::HandleKey(consumer, event, pressed);
}
+bool wxStdToolbarInputHandler::HandleMouse(wxInputConsumer *consumer,
+ const wxMouseEvent& event)
+{
+ wxToolBar *tbar = wxStaticCast(consumer->GetInputWindow(), wxToolBar);
+ wxToolBarToolBase *tool = tbar->FindToolForPosition(event.GetX(), event.GetY());
+
+ if ( event.Button(1) )
+ {
+
+ if ( event.LeftDown() || event.LeftDClick() )
+ {
+ if ( !tool || !tool->IsEnabled() )
+ return TRUE;
+
+ m_winCapture = tbar;
+ m_winCapture->CaptureMouse();
+
+ m_toolCapture = tool;
+
+ consumer->PerformAction( wxACTION_BUTTON_PRESS, tool->GetId() );
+
+ return TRUE;
+ }
+ else if ( event.LeftUp() )
+ {
+ if ( m_winCapture )
+ {
+ m_winCapture->ReleaseMouse();
+ m_winCapture = NULL;
+ }
+
+ if ( tool == m_toolCapture )
+ consumer->PerformAction( wxACTION_BUTTON_TOGGLE, m_toolCapture->GetId() );
+ else
+ consumer->PerformAction( wxACTION_TOOLBAR_LEAVE, m_toolCapture->GetId() );
+
+ m_toolCapture = NULL;
+
+ return TRUE;
+ }
+ //else: don't do anything special about the double click
+ }
+
+ return wxStdInputHandler::HandleMouse(consumer, event);
+}
+
bool wxStdToolbarInputHandler::HandleMouseMove(wxInputConsumer *consumer,
const wxMouseEvent& event)
{
- if ( !wxStdButtonInputHandler::HandleMouseMove(consumer, event) )
+ if ( !wxStdInputHandler::HandleMouseMove(consumer, event) )
{
- wxToolBarToolBase *tool;
-
+ wxToolBar *tbar = wxStaticCast(consumer->GetInputWindow(), wxToolBar);
+
+ wxToolBarTool *tool;
if ( event.Leaving() )
{
+ // We cannot possibly be over a tool when
+ // leaving the toolbar
tool = NULL;
}
else
{
- wxToolBar *tbar = wxStaticCast(consumer->GetInputWindow(), wxToolBar);
- tool = tbar->FindToolForPosition(event.GetX(), event.GetY());
+ tool = (wxToolBarTool*) tbar->FindToolForPosition( event.GetX(), event.GetY() );
+ }
+
+ if (m_toolCapture)
+ {
+ // During capture we only care of the captured tool
+ if (tool && (tool != m_toolCapture))
+ tool = NULL;
+
+ if (tool == m_toolLast)
+ return TRUE;
+
+ if (tool)
+ consumer->PerformAction( wxACTION_BUTTON_PRESS, m_toolCapture->GetId() );
+ else
+ consumer->PerformAction( wxACTION_BUTTON_RELEASE, m_toolCapture->GetId() );
+
+ m_toolLast = tool;
}
-
- if ( tool )
- consumer->PerformAction(wxACTION_TOOLBAR_ENTER, tool->GetId());
else
- consumer->PerformAction(wxACTION_TOOLBAR_LEAVE);
-
+ {
+ if (tool == m_toolLast)
+ return TRUE;
+
+ if (m_toolLast)
+ {
+ // Leave old tool if any
+ consumer->PerformAction( wxACTION_TOOLBAR_LEAVE, m_toolLast->GetId() );
+ }
+
+ if (tool)
+ {
+ // Enter new tool if any
+ consumer->PerformAction( wxACTION_TOOLBAR_ENTER, tool->GetId() );
+ }
+
+ m_toolLast = tool;
+ }
+
return TRUE;
}
bool wxStdToolbarInputHandler::HandleFocus(wxInputConsumer *consumer,
const wxFocusEvent& event)
{
- // we shouldn't be left with a highlighted button
- consumer->PerformAction(wxACTION_TOOLBAR_LEAVE);
+ if (m_toolCapture)
+ {
+ // We shouldn't be left with a highlighted button
+ consumer->PerformAction( wxACTION_TOOLBAR_LEAVE, m_toolCapture->GetId() );
+ }
return TRUE;
}
bool wxStdToolbarInputHandler::HandleActivation(wxInputConsumer *consumer,
bool activated)
{
- // as above
- if ( !activated )
- consumer->PerformAction(wxACTION_TOOLBAR_LEAVE);
+ if (m_toolCapture && !activated)
+ {
+ // We shouldn't be left with a highlighted button
+ consumer->PerformAction( wxACTION_TOOLBAR_LEAVE, m_toolCapture->GetId() );
+ }
return TRUE;
}
+#endif // wxUSE_TOOLBAR
+
projects / wxWidgets.git / blobdiff