Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Key sequences (shortcuts) added to Character Catalog tooltips

Browse Source
This commit is contained in:
Simon Rozman 2016-05-06 13:42:14 +02:00
parent 7545e9dadf
commit 1867235007
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ZRCola/zrcolachrgrid.cpp
View File

@ -85,6 +85,30 @@ void wxZRColaCharGrid::SetCharacters(const wxString &chars)
} }
wxString wxZRColaCharGrid::GetToolTipText(int idx)
{
wxASSERT_MSG(idx < m_chars.Length(), wxT("index out of bounds"));
ZRColaApp *app = (ZRColaApp*)wxTheApp;
// See if this character has a key sequence registered.
ZRCola::keyseq_db::indexKey::size_type start, end;
bool found;
ZRCola::keyseq_db::keyseq *ks = (ZRCola::keyseq_db::keyseq*)new char[sizeof(ZRCola::keyseq_db::keyseq)];
ks->chr = m_chars[idx];
ks->seq_len = 0;
found = app->m_ks_db.idxChr.find(*ks, start, end);
delete ks;
if (found) {
ZRCola::keyseq_db::keyseq &seq = app->m_ks_db.idxChr[start];
return wxString::Format(wxT("U+%04X (%s)"), (int)m_chars[idx], ZRColaApp::GetKeySequenceAsText(seq.seq, seq.seq_len).c_str());
}
return wxString::Format(wxT("U+%04X"), (int)m_chars[idx]);
}
void wxZRColaCharGrid::OnSize(wxSizeEvent& event) void wxZRColaCharGrid::OnSize(wxSizeEvent& event)
{ {
event.Skip(); event.Skip();
@ -175,7 +199,7 @@ void wxZRColaCharGrid::OnMotion(wxMouseEvent& event)
wxWindow *gridWnd = GetGridWindow(); wxWindow *gridWnd = GetGridWindow();
if (gridWnd->GetToolTip()) { if (gridWnd->GetToolTip()) {
// The tooltip is already shown. Update it immediately. // The tooltip is already shown. Update it immediately.
gridWnd->SetToolTip(wxString::Format(wxT("U+%04X"), (int)m_chars[m_toolTipIdx])); gridWnd->SetToolTip(GetToolTipText(m_toolTipIdx));
} else { } else {
// This must be our initial entry. Schedule tooltip display after 1s. // This must be our initial entry. Schedule tooltip display after 1s.
m_toolTipTimer->Start(1000, true); m_toolTipTimer->Start(1000, true);
@ -191,5 +215,5 @@ void wxZRColaCharGrid::OnTooltipTimer(wxTimerEvent& event)
if (m_toolTipIdx >= m_chars.Length()) if (m_toolTipIdx >= m_chars.Length())
return; return;
GetGridWindow()->SetToolTip(wxString::Format(wxT("U+%04X"), (int)m_chars[m_toolTipIdx])); GetGridWindow()->SetToolTip(GetToolTipText(m_toolTipIdx));
} }

2
ZRCola/zrcolachrgrid.h
View File

@ -59,6 +59,8 @@ public:
void SetCharacters(const wxString &chars); void SetCharacters(const wxString &chars);
protected: protected:
virtual wxString GetToolTipText(int idx);
void OnSize(wxSizeEvent& event); void OnSize(wxSizeEvent& event);
void OnKeyDown(wxKeyEvent& event); void OnKeyDown(wxKeyEvent& event);
void OnMotion(wxMouseEvent& event); void OnMotion(wxMouseEvent& event);