Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-01 08:09:41 +02:00
Code Issues Releases Wiki Activity

Don't need extra indirection handling wxFont, see documentation of it

Browse Source
This commit is contained in:
Paul Licameli 2020-01-22 09:37:01 -05:00
parent 05c80cfb4f
commit 80f884b0b7
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/widgets/Ruler.cpp
View File

@ -110,9 +110,9 @@ Ruler::Ruler()
fontSize = 8;
#endif
mMinorMinorFont = std::make_unique<wxFont>(fontSize - 1, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
mMinorFont = std::make_unique<wxFont>(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
mMajorFont = std::make_unique<wxFont>(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
mMinorMinorFont = wxFont{ fontSize - 1, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL };
mMinorFont = wxFont{ fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL };
mMajorFont = wxFont{ fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD };
mUserFonts = false;
@ -261,9 +261,9 @@ void Ruler::SetMinor(bool value)
void Ruler::SetFonts(const wxFont &minorFont, const wxFont &majorFont, const wxFont &minorMinorFont)
{
*mMinorMinorFont = minorMinorFont;
*mMinorFont = minorFont;
*mMajorFont = majorFont;
mMinorMinorFont = minorMinorFont;
mMinorFont = minorFont;
mMajorFont = majorFont;
// Won't override these fonts
mUserFonts = true;
@ -853,7 +853,7 @@ bool Ruler::Tick(
const auto result = MakeTick(
lab,
dc,
(major? *mMajorFont: minor? *mMinorFont : *mMinorMinorFont),
(major? mMajorFont: minor? mMinorFont : mMinorMinorFont),
mBits,
mLeft, mTop, mSpacing, mLead,
mFlip,
@ -891,7 +891,7 @@ bool Ruler::TickCustom( wxDC &dc, int labelIdx, bool major, bool minor )
lab,
dc,
(major? *mMajorFont: minor? *mMinorFont : *mMinorMinorFont),
(major? mMajorFont: minor? mMinorFont : mMinorMinorFont),
mBits,
mLeft, mTop, mSpacing, mLead,
mFlip,
@ -970,11 +970,11 @@ void Ruler::Update(
dc.GetTextExtent(exampleText, &strW, &strH, &strD, &strL);
mLead = strL;
mMajorFont = std::make_unique<wxFont>(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
mMajorFont = wxFont{ fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD };
mMinorFont = std::make_unique<wxFont>(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
mMinorFont = wxFont{ fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL };
mMinorMinorFont = std::make_unique<wxFont>(fontSize - 1, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
mMinorMinorFont = wxFont{ fontSize - 1, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL };
}
// If ruler is being resized, we could end up with it being too small.
@ -1305,7 +1305,7 @@ void Ruler::Draw(wxDC& dc, const Envelope* envelope)
}
}
dc.SetFont(*mMajorFont);
dc.SetFont(mMajorFont);
// We may want to not show the ticks at the extremes,
// though still showing the labels.
@ -1343,12 +1343,12 @@ void Ruler::Draw(wxDC& dc, const Envelope* envelope)
drawLabel( label, 4 );
if( mbMinor ) {
dc.SetFont(*mMinorFont);
dc.SetFont(mMinorFont);
for( const auto &label : mMinorLabels )
drawLabel( label, 2 );
}
dc.SetFont(*mMinorMinorFont);
dc.SetFont(mMinorMinorFont);
for( const auto &label : mMinorMinorLabels )
if ( !label.text.empty() )

6
src/widgets/Ruler.h
View File

@ -98,9 +98,9 @@ class AUDACITY_DLL_API Ruler {
// Good defaults are provided, but you can override here
void SetFonts(const wxFont &minorFont, const wxFont &majorFont, const wxFont &minorMinorFont);
struct Fonts { wxFont *major, *minor, *minorMinor; };
struct Fonts { wxFont major, minor, minorMinor; };
Fonts GetFonts() const
{ return { mMajorFont.get(), mMinorFont.get(), mMinorMinorFont.get() }; }
{ return { mMajorFont, mMinorFont, mMinorMinorFont }; }
// Copies *pScale if it is not NULL
void SetNumberScale(const NumberScale *pScale);
@ -174,7 +174,7 @@ private:
int mLeft, mTop, mRight, mBottom, mLead;
int mLength;
std::unique_ptr<wxFont> mMinorFont, mMajorFont, mMinorMinorFont;
wxFont mMinorFont, mMajorFont, mMinorMinorFont;
bool mUserFonts;
double mMin, mMax;