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

Aesthetic modifications

Browse Source
This commit is contained in:
Simon Rozman 2016-05-09 11:57:19 +02:00
parent 79ae4855e3
commit ae3344d5eb
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ZRCola/zrcolacomppnl.cpp
View File

@ -124,10 +124,9 @@ void wxZRColaComposerPanel::OnDecomposedHexPaint(wxPaintEvent& event)
void wxZRColaComposerPanel::OnDecomposedText(wxCommandEvent& event) void wxZRColaComposerPanel::OnDecomposedText(wxCommandEvent& event)
{ {
if (m_progress) { event.Skip();
// We are being updated by wxZRColaComposerPanel::OnComposedText()
event.Skip(); if (!m_progress) {
} else {
m_timer->Stop(); m_timer->Stop();
#ifdef __WINDOWS__ #ifdef __WINDOWS__
@ -166,7 +165,6 @@ void wxZRColaComposerPanel::OnDecomposedText(wxCommandEvent& event)
m_composedHex->SetValue(hex); m_composedHex->SetValue(hex);
m_composedHex->SetSelection(m_mappingComposedHex.to_dst(from), m_mappingComposedHex.to_dst(to)); m_composedHex->SetSelection(m_mappingComposedHex.to_dst(from), m_mappingComposedHex.to_dst(to));
event.Skip();
m_progress = false; m_progress = false;
// Schedule state save after 3s. // Schedule state save after 3s.
@ -213,10 +211,9 @@ void wxZRColaComposerPanel::OnComposedHexPaint(wxPaintEvent& event)
void wxZRColaComposerPanel::OnComposedText(wxCommandEvent& event) void wxZRColaComposerPanel::OnComposedText(wxCommandEvent& event)
{ {
if (m_progress) { event.Skip();
// We are being updated by wxZRColaComposerPanel::OnDecomposedText()
event.Skip(); if (!m_progress) {
} else {
m_timer->Stop(); m_timer->Stop();
#ifdef __WINDOWS__ #ifdef __WINDOWS__
@ -260,7 +257,6 @@ void wxZRColaComposerPanel::OnComposedText(wxCommandEvent& event)
m_decomposedHex->SetValue(hex); m_decomposedHex->SetValue(hex);
m_decomposedHex->SetSelection(m_mappingDecomposedHex.to_dst(from), m_mappingDecomposedHex.to_dst(to)); m_decomposedHex->SetSelection(m_mappingDecomposedHex.to_dst(from), m_mappingDecomposedHex.to_dst(to));
event.Skip();
m_progress = false; m_progress = false;
// Schedule state save after 3s. // Schedule state save after 3s.