GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Resolves #234 - change the order of assigning an icon and alias text to the audio panel in an attempt to prevent the audio channel panel from wrapping to the next line when the text is too long to display.

Browse Source
This commit is contained in:
Denny
2017-03-30 19:52:35 -04:00
parent 069f951a86
commit 5fe8ccd478
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/audio/AudioChannelPanel.java
View File

@@ -90,7 +90,8 @@ public class AudioChannelPanel extends JPanel
private void init()
{
setLayout(new MigLayout("align center center, insets 0 0 0 0", "[][][align right]0[grow,fill]", ""));
setLayout(new MigLayout("align center center, insets 0 0 0 0",
"[][][align right]0[grow,fill]", ""));
setBackground(mBackgroundColor);
mMutedLabel.setFont(mFont);
@@ -159,30 +160,29 @@ public class AudioChannelPanel extends JPanel
* does not occur on the Swing event thread -- wrap any calls to this
* method with an event thread call.
*/
private void updateLabel(JLabel valueLabel, String value, JLabel aliasLabel, Alias alias)
private void updateLabel(JLabel textLabel, String value, JLabel iconLabel, Alias alias)
{
if(value != null)
{
if(alias != null)
{
valueLabel.setText(alias.getName());
aliasLabel.setIcon(mIconManager.getIcon(alias.getIconName(), 18));
iconLabel.setIcon(mIconManager.getIcon(alias.getIconName(), 18));
textLabel.setText(alias.getName());
}
else
{
valueLabel.setText(value);
aliasLabel.setIcon(null);
iconLabel.setIcon(null);
textLabel.setText(value);
}
}
else
{
valueLabel.setText("-----");
aliasLabel.setIcon(null);
iconLabel.setIcon(null);
textLabel.setText("-----");
}
}
/**
* Processes audio metadata to update this panel's display values
*/

1
src/audio/AudioChannelsPanel.java
View File

@@ -33,7 +33,6 @@ public class AudioChannelsPanel extends JPanel
public AudioChannelsPanel(IconManager iconManager, SettingsManager settingsManager, IAudioController controller)
{
// setLayout(new MigLayout("insets 0 0 0 0", "[][grow,fill][][grow,fill]", "[grow,fill]"));
setLayout(new MigLayout("insets 0 0 0 0", "[][sg,grow,fill][][sg,grow,fill]", "[grow,fill]"));
setBackground(Color.BLACK);