Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 06:01:13 +02:00
Code Issues Releases Wiki Activity

ToolManager.cpp does not depend on Meter

Browse Source
This commit is contained in:
Paul Licameli
2019-06-15 09:03:30 -04:00
parent b84f5b66f0
commit 0b897c81b0
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/widgets/Meter.cpp
View File

@@ -268,7 +268,7 @@ enum {
OnPreferencesID
};
BEGIN_EVENT_TABLE(MeterPanel, wxPanelWrapper)
BEGIN_EVENT_TABLE(MeterPanel, MeterPanelBase)
EVT_TIMER(OnMeterUpdateID, MeterPanel::OnMeterUpdate)
EVT_MOUSE_EVENTS(MeterPanel::OnMouse)
EVT_CONTEXT_MENU(MeterPanel::OnContext)
@@ -2123,13 +2123,6 @@ wxString MeterPanel::Key(const wxString & key) const
return wxT("/Meter/Output/") + key;
}
bool MeterPanel::s_AcceptsFocus{ false };
auto MeterPanel::TemporarilyAllowFocus() -> TempAllowFocus {
s_AcceptsFocus = true;
return TempAllowFocus{ &s_AcceptsFocus };
}
// This compensates for a but in wxWidgets 3.0.2 for mac:
// Couldn't set focus from keyboard when AcceptsFocus returns false;
// this bypasses that limitation

10
src/widgets/Meter.h
View File

@@ -117,9 +117,6 @@ class MeterPanel final : public MeterPanelBase, private PrefsListener
Style style = HorizontalStereo,
float fDecayRate = 60.0f);
bool AcceptsFocus() const override { return s_AcceptsFocus; }
bool AcceptsFocusFromKeyboard() const override { return true; }
void SetFocusFromKbd() override;
void Clear() override;
@@ -192,13 +189,6 @@ class MeterPanel final : public MeterPanelBase, private PrefsListener
void UpdatePrefs() override;
void UpdateSelectedPrefs( int ) override;
static bool s_AcceptsFocus;
struct Resetter { void operator () (bool *p) const { if(p) *p = false; } };
using TempAllowFocus = std::unique_ptr<bool, Resetter>;
public:
static TempAllowFocus TemporarilyAllowFocus();
private:
//
// Event handlers

7
src/widgets/MeterPanelBase.cpp
View File

@@ -13,3 +13,10 @@ Paul Licameli split from Meter.cpp
MeterPanelBase::~MeterPanelBase()
{
}
bool MeterPanelBase::s_AcceptsFocus{ false };
auto MeterPanelBase::TemporarilyAllowFocus() -> TempAllowFocus {
s_AcceptsFocus = true;
return TempAllowFocus{ &s_AcceptsFocus };
}

10
src/widgets/MeterPanelBase.h
View File

@@ -26,7 +26,17 @@ public:
int numFrames, float *sampleData) = 0;
virtual bool IsMeterDisabled() const = 0;
virtual float GetMaxPeak() const = 0;
bool AcceptsFocus() const override { return s_AcceptsFocus; }
bool AcceptsFocusFromKeyboard() const override { return true; }
private:
static bool s_AcceptsFocus;
struct Resetter { void operator () (bool *p) const { if(p) *p = false; } };
using TempAllowFocus = std::unique_ptr<bool, Resetter>;
public:
static TempAllowFocus TemporarilyAllowFocus();
};
#endif