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

Updates.

Browse Source
This commit is contained in:
denny
2016-02-13 13:59:10 -05:00
parent 37a93c8884
commit 5071205e73
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/module/decode/state/ChannelStatePanel.java
View File

@@ -260,6 +260,7 @@ public class ChannelStatePanel extends JPanel
if( channelState != null )
{
<<<<<<< Upstream, based on origin/master
switch( channelState.getState() )
{
case CALL:
@@ -284,6 +285,24 @@ public class ChannelStatePanel extends JPanel
if( p == null )
{
p = getGradient( mColorTopIdle, mColorMiddleIdle );
=======
case CALL:
p = getGradient( mColorTopCall, mColorMiddleCall );
break;
case CONTROL:
p = getGradient( mColorTopControl, mColorMiddleControl );
break;
case DATA:
p = getGradient( mColorTopData, mColorMiddleData );
break;
case FADE:
p = getGradient( mColorTopFade, mColorMiddleFade );
break;
case IDLE:
default:
p = getGradient( mColorTopIdle, mColorMiddleIdle );
break;
>>>>>>> 0e01381 Updates.
}
g2.setPaint( p );