Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-30 15:18:42 +02:00
Code Issues Releases Wiki Activity

Button and hover effect for microphone/speaker on meter bar.

Browse Source 
Also fixed capitalisation of "Blend system and Audacity theme"
This commit is contained in:
James Crook 2017-04-24 20:06:40 +01:00
parent d0bafebfdf
commit 03af77387e
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/prefs/GUIPrefs.cpp
View File

@ -188,7 +188,7 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
S.TieCheckBox(_("Re&tain labels if selection snaps to a label edge"),
wxT("/GUI/RetainLabels"),
false);
S.TieCheckBox(_("B&lend System and Audacity Theme"),
S.TieCheckBox(_("B&lend system and Audacity theme"),
wxT("/GUI/BlendThemes"),
true);
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY

23
src/widgets/Meter.cpp
View File

@ -462,14 +462,9 @@ void Meter::OnPaint(wxPaintEvent & WXUNUSED(event))
if (mStyle != MixerTrackCluster)
{
bool highlight = InIcon();
if (highlight) {
auto rect = mIconRect;
rect.Inflate(gap, gap);
wxColour colour(247, 247, 247);
dc.SetBrush(colour);
dc.SetPen(colour );
dc.DrawRectangle(rect);
}
dc.DrawBitmap( theTheme.Bitmap( highlight ? bmpHiliteButtonSmall : bmpUpButtonSmall ),
mIconRect.GetPosition(), false );
dc.DrawBitmap(*mIcon, mIconRect.GetPosition(), true);
dc.SetFont(GetFont());
dc.SetTextForeground( clrText );
@ -1411,8 +1406,8 @@ void Meter::HandleLayout(wxDC &dc)
mRuler.OfflimitsPixels(0, 0);
break;
case HorizontalStereo:
// Ensure there's a margin between left edge of window and items
left = gap;
// Button right next to dragger.
left = 0;
// Add a gap between bottom of icon and bottom of window
height -= gap;
@ -1422,6 +1417,7 @@ void Meter::HandleLayout(wxDC &dc)
mIconRect.SetY(height - iconHeight);
mIconRect.SetWidth(iconWidth);
mIconRect.SetHeight(iconHeight);
left = gap;
// Make sure there's room for icon and gap between the bottom of the meter and icon
height -= iconHeight + gap;
@ -1466,15 +1462,16 @@ void Meter::HandleLayout(wxDC &dc)
mRuler.OfflimitsPixels(0, mIconRect.GetRight() - 4);
break;
case HorizontalStereoCompact:
// Ensure there's a margin between left edge of window and items
left = gap;
// Button right next to dragger.
left = 0;
// Create icon rectangle
mIconRect.SetX(left);
mIconRect.SetY((height - iconHeight) / 2);
mIconRect.SetY((height - iconHeight) / 2 -1);
mIconRect.SetWidth(iconWidth);
mIconRect.SetHeight(iconHeight);
left = gap;
// Add width of icon and gap between icon and L/R
left += iconWidth + gap;