mirror of
https://github.com/cookiengineer/audacity
synced 2025-05-07 15:22:34 +02:00
Bug1202: Slider tooltips should not steal focus on Mac.
This commit is contained in:
parent
b81efbb816
commit
56acdf684c
@ -82,7 +82,7 @@ const int sliderFontSize = 12;
|
|||||||
// TipPanel
|
// TipPanel
|
||||||
//
|
//
|
||||||
|
|
||||||
class TipPanel final : public wxPopupWindow
|
class TipPanel final : public wxFrame
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
TipPanel(wxWindow *parent, const wxString & label);
|
TipPanel(wxWindow *parent, const wxString & label);
|
||||||
@ -115,7 +115,8 @@ BEGIN_EVENT_TABLE(TipPanel, wxPopupWindow)
|
|||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
TipPanel::TipPanel(wxWindow *parent, const wxString & maxLabel)
|
TipPanel::TipPanel(wxWindow *parent, const wxString & maxLabel)
|
||||||
: wxPopupWindow(parent, wxFRAME_SHAPED)
|
: wxFrame(parent, wxID_ANY, wxString{}, wxDefaultPosition, wxDefaultSize,
|
||||||
|
wxFRAME_SHAPED | wxFRAME_FLOAT_ON_PARENT)
|
||||||
{
|
{
|
||||||
SetBackgroundStyle(wxBG_STYLE_PAINT);
|
SetBackgroundStyle(wxBG_STYLE_PAINT);
|
||||||
|
|
||||||
@ -940,7 +941,7 @@ void LWSlider::ShowTip(bool show)
|
|||||||
CreatePopWin();
|
CreatePopWin();
|
||||||
FormatPopWin();
|
FormatPopWin();
|
||||||
SetPopWinPosition();
|
SetPopWinPosition();
|
||||||
mTipPanel->Show();
|
mTipPanel->ShowWithoutActivating();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -229,7 +229,6 @@ class LWSlider
|
|||||||
|
|
||||||
TipPanel *mTipPanel;
|
TipPanel *mTipPanel;
|
||||||
wxString mTipTemplate;
|
wxString mTipTemplate;
|
||||||
wxTimer mTimer;
|
|
||||||
|
|
||||||
Ruler* mpRuler;
|
Ruler* mpRuler;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user