hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update mute and solo buttons, add them to instrument windows (#7708)

Browse Source 
* Add mute and solo buttons to instrument windows
* Change mute and solo buttons to optimized CC0 SVG assets
* Icons provided by @StakeoutPunch, button backgrounds provided by
@RebeccaDeField

---------

Co-authored-by: Sotonye Atemie <sakertooth@gmail.com>
Co-authored-by: Rebecca Noel Ati <contactme@rebeccadefield.com>
Co-authored-by: Stakeout Punch <StakeoutPunch@users.noreply.github.com>
This commit is contained in:
Fawn
2025-03-11 12:30:04 -06:00
committed by GitHub
parent 8821d88c09
commit 6233c5b9e4
13 changed files with 242 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/InstrumentTrackWindow.h
View File

@@ -28,6 +28,7 @@
#include <QWidget>
#include "ModelView.h"
#include "PixmapButton.h"
#include "SerializingObject.h"
#include "PluginView.h"
@@ -147,6 +148,8 @@ private:
Knob * m_volumeKnob;
Knob * m_panningKnob;
Knob * m_pitchKnob;
PixmapButton *m_muteBtn;
PixmapButton *m_soloBtn;
QLabel * m_pitchLabel;
LcdSpinBox* m_pitchRangeSpinBox;
QLabel * m_pitchRangeLabel;

3
include/SampleTrackWindow.h
View File

@@ -28,6 +28,7 @@
#include <QWidget>
#include "ModelView.h"
#include "PixmapButton.h"
#include "SampleTrack.h"
#include "SerializingObject.h"
@@ -90,6 +91,8 @@ private:
QLineEdit * m_nameLineEdit;
Knob * m_volumeKnob;
Knob * m_panningKnob;
PixmapButton *m_muteBtn;
PixmapButton *m_soloBtn;
MixerChannelLcdSpinBox * m_mixerChannelNumber;
EffectRackView * m_effectRack;

2
include/Track.h
View File

@@ -219,9 +219,9 @@ private:
protected:
BoolModel m_mutedModel;
BoolModel m_soloModel;
private:
BoolModel m_soloModel;
bool m_mutedBeforeSolo;
clipVector m_clips;

6
include/TrackView.h
View File

@@ -48,12 +48,12 @@ class FadeButton;
class TrackContainerView;
const int DEFAULT_SETTINGS_WIDGET_WIDTH = 256;
const int DEFAULT_SETTINGS_WIDGET_WIDTH = 260;
const int TRACK_OP_WIDTH = 78;
// This shaves 150-ish pixels off track buttons,
// ruled from config: ui.compacttrackbuttons
const int DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT = 128;
const int TRACK_OP_WIDTH_COMPACT = 62;
const int DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT = 136;
const int TRACK_OP_WIDTH_COMPACT = TRACK_OP_WIDTH;
class TrackView : public QWidget, public ModelView, public JournallingObject