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

Split up the context menu functionality to make it easier to customise.

Browse Source 
Tweaked style combobox popup border.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2011-12-30 17:12:37 +00:00
parent cf5d4c76af
commit 9b794421ae
4 changed files with 144 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/richtext/richtextctrl.h
View File

@@ -1564,6 +1564,17 @@ public:
*/
bool ApplyStyleSheet(wxRichTextStyleSheet* styleSheet = NULL);
/**
Shows the given context menu, optionally adding appropriate property-editing commands for the current position in the object hierarchy.
*/
virtual bool ShowContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands = true);
/**
Prepares the context menu, optionally adding appropriate property-editing commands.
Returns the number of property commands added.
*/
virtual int PrepareContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands = true);
// Command handlers
/**

11
interface/wx/richtext/richtextctrl.h
View File

@@ -1537,6 +1537,17 @@ public:
*/
bool ApplyStyleSheet(wxRichTextStyleSheet* styleSheet = NULL);
/**
Shows the given context menu, optionally adding appropriate property-editing commands for the current position in the object hierarchy.
*/
virtual bool ShowContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands);
/**
Prepares the context menu, optionally adding appropriate property-editing commands.
Returns the number of property commands added.
*/
virtual int PrepareContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands);
// Command handlers
/**

180
src/richtext/richtextctrl.cpp
View File

@@ -3200,45 +3200,97 @@ void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event)
return;
}
ShowContextMenu(m_contextMenu, event.GetPosition());
}
// Prepares the context menu, adding appropriate property-editing commands.
// Returns the number of property commands added.
int wxRichTextCtrl::PrepareContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands)
{
wxClientDC dc(this);
PrepareDC(dc);
dc.SetFont(GetFont());
long position = 0;
wxPoint pt = event.GetPosition();
wxPoint logicalPt = GetLogicalPoint(ScreenToClient(pt));
wxRichTextObject* hitObj = NULL;
wxRichTextObject* contextObj = NULL;
int hit = GetFocusObject()->HitTest(dc, logicalPt, position, & hitObj, & contextObj);
m_contextMenuPropertiesInfo.Clear();
if (hit == wxRICHTEXT_HITTEST_ON || hit == wxRICHTEXT_HITTEST_BEFORE || hit == wxRICHTEXT_HITTEST_AFTER)
long position = 0;
wxRichTextObject* hitObj = NULL;
wxRichTextObject* contextObj = NULL;
if (pt != wxDefaultPosition)
{
wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
if (hitObj && actualContainer)
{
if (actualContainer->AcceptsFocus())
{
SetFocusObject(actualContainer, false /* don't set caret position yet */);
SetCaretPositionAfterClick(actualContainer, position, hit);
}
wxPoint logicalPt = GetLogicalPoint(ScreenToClient(pt));
int hit = GetBuffer().HitTest(dc, logicalPt, position, & hitObj, & contextObj);
m_contextMenuPropertiesInfo.AddItems(actualContainer, hitObj);
if (hit == wxRICHTEXT_HITTEST_ON || hit == wxRICHTEXT_HITTEST_BEFORE || hit == wxRICHTEXT_HITTEST_AFTER)
{
wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
if (hitObj && actualContainer)
{
if (actualContainer->AcceptsFocus())
{
SetFocusObject(actualContainer, false /* don't set caret position yet */);
SetCaretPositionAfterClick(actualContainer, position, hit);
}
if (addPropertyCommands)
m_contextMenuPropertiesInfo.AddItems(actualContainer, hitObj);
}
else
{
if (addPropertyCommands)
m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL);
}
}
else
m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL);
{
if (addPropertyCommands)
m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL);
}
}
else
{
m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL);
// Invoked from the keyboard, so don't set the caret position and don't use the event
// position
hitObj = GetFocusObject()->GetLeafObjectAtPosition(m_caretPosition+1);
if (hitObj)
contextObj = hitObj->GetParentContainer();
else
contextObj = GetFocusObject();
wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
if (hitObj && actualContainer)
{
if (addPropertyCommands)
m_contextMenuPropertiesInfo.AddItems(actualContainer, hitObj);
}
else
{
if (addPropertyCommands)
m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL);
}
}
if (m_contextMenu)
if (menu)
{
m_contextMenuPropertiesInfo.AddMenuItems(m_contextMenu);
PopupMenu(m_contextMenu);
if (addPropertyCommands)
m_contextMenuPropertiesInfo.AddMenuItems(menu);
return m_contextMenuPropertiesInfo.GetCount();
}
else
return 0;
}
// Shows the context menu, adding appropriate property-editing commands
bool wxRichTextCtrl::ShowContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands)
{
if (menu)
{
PrepareContextMenu(menu, pt, addPropertyCommands);
PopupMenu(menu);
return true;
}
else
return false;
}
bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
@@ -4279,12 +4331,11 @@ bool wxRichTextContextMenuPropertiesInfo::AddItem(const wxString& label, wxRichT
int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd) const
{
wxMenuItem* item = menu->FindItem(startCmd);
// If none of the standard properties identifiers are in the menu, assume it's
// a custom menu without properties commands, and don't add them.
if (item)
// If none of the standard properties identifiers are in the menu, add them if necessary.
// If no items to add, just set the text to something generic
if (GetCount() == 0)
{
// If no items, to add just set the text to something generic
if (GetCount() == 0)
if (item)
{
menu->SetLabel(startCmd, _("&Properties"));
@@ -4298,50 +4349,59 @@ int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd
}
}
}
else
}
else
{
int i;
int pos = -1;
// Find the position of the first properties item
for (i = 0; i < (int) menu->GetMenuItemCount(); i++)
{
int i;
int pos = -1;
// Find the position of the first properties item
for (i = 0; i < (int) menu->GetMenuItemCount(); i++)
wxMenuItem* item = menu->FindItemByPosition(i);
if (item && item->GetId() == startCmd)
{
wxMenuItem* item = menu->FindItemByPosition(i);
if (item && item->GetId() == startCmd)
pos = i;
break;
}
}
if (pos != -1)
{
int insertBefore = pos+1;
for (i = startCmd; i < startCmd+GetCount(); i++)
{
if (menu->FindItem(i))
{
pos = i;
break;
menu->SetLabel(i, m_labels[i - startCmd]);
}
else
{
if (insertBefore >= (int) menu->GetMenuItemCount())
menu->Append(i, m_labels[i - startCmd]);
else
menu->Insert(insertBefore, i, m_labels[i - startCmd]);
}
insertBefore ++;
}
if (pos != -1)
// Delete any old items still left on the menu
for (i = startCmd + GetCount(); i < startCmd+3; i++)
{
int insertBefore = pos+1;
for (i = startCmd; i < startCmd+GetCount(); i++)
if (menu->FindItem(i))
{
if (menu->FindItem(i))
{
menu->SetLabel(i, m_labels[i - startCmd]);
}
else
{
if (insertBefore >= (int) menu->GetMenuItemCount())
menu->Append(i, m_labels[i - startCmd]);
else
menu->Insert(insertBefore, i, m_labels[i - startCmd]);
}
insertBefore ++;
}
// Delete any old items still left on the menu
for (i = startCmd + GetCount(); i < startCmd+3; i++)
{
if (menu->FindItem(i))
{
menu->Delete(i);
}
menu->Delete(i);
}
}
}
else
{
// No existing property identifiers were found, so append to the end of the menu.
menu->AppendSeparator();
for (i = startCmd; i < startCmd+GetCount(); i++)
{
menu->Append(i, m_labels[i - startCmd]);
}
}
}
return GetCount();

4
src/richtext/richtextstyles.cpp
View File

@@ -1209,8 +1209,8 @@ END_EVENT_TABLE()
bool wxRichTextStyleComboPopup::Create( wxWindow* parent )
{
int borderStyle = GetDefaultBorder();
if (borderStyle == wxBORDER_SUNKEN)
borderStyle = wxBORDER_SIMPLE;
if (borderStyle == wxBORDER_SUNKEN || borderStyle == wxBORDER_NONE)
borderStyle = wxBORDER_THEME;
return wxRichTextStyleListBox::Create(parent, wxID_ANY,
wxPoint(0,0), wxDefaultSize,