Skip to content

Commit 0c1b9d5

Browse files
liuwenlongliuwenlong
committed
按要求修改UI效果
1 parent 4e3e125 commit 0c1b9d5

File tree

9 files changed

+23
-25
lines changed

9 files changed

+23
-25
lines changed

‎apps/player/MusicOperateView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ namespace mango
253253
x+=50;
254254
x+=33;
255255
if(isSec)
256-
canvas.setTextColor(RGB(255,149,0));
256+
canvas.setTextColor(COLOR_PLAY_ORANGE);
257257
else
258258
canvas.setTextColor(COLOR_TEXT);
259259
canvas.setTextSize(18);

‎apps/player/SettingsView.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ namespace mango
578578
canvas.drawImageResource(mImgRes[index],x,y+10);
579579
x+=33;
580580
if(isSec)
581-
canvas.setTextColor(RGB(255,149,0));
581+
canvas.setTextColor(COLOR_PLAY_ORANGE);
582582
else
583583
canvas.setTextColor(COLOR_TEXT);
584584
canvas.setTextSize(18);
@@ -604,7 +604,7 @@ namespace mango
604604
canvas.drawImageResource(mImgRes[index],x,y+10);
605605
x+=33;
606606
if(isSec)
607-
canvas.setTextColor(RGB(255,149,0));
607+
canvas.setTextColor(COLOR_PLAY_ORANGE);
608608
else
609609
canvas.setTextColor(COLOR_TEXT);
610610
canvas.setTextSize(18);
@@ -635,7 +635,7 @@ namespace mango
635635
canvas.drawImageResource(mImgRes[index],x,y+10);
636636
x+=33;
637637
if(isSec)
638-
canvas.setTextColor(RGB(255,149,0));
638+
canvas.setTextColor(COLOR_PLAY_ORANGE);
639639
else
640640
canvas.setTextColor(COLOR_TEXT);
641641
canvas.setTextSize(18);
@@ -667,7 +667,7 @@ namespace mango
667667
canvas.drawImageResource(mImgRes[index],x,y+10);
668668
x+=33;
669669
if(isSec)
670-
canvas.setTextColor(RGB(255,149,0));
670+
canvas.setTextColor(COLOR_PLAY_ORANGE);
671671
else
672672
canvas.setTextColor(COLOR_TEXT);
673673
canvas.setTextSize(18);
@@ -698,7 +698,7 @@ namespace mango
698698
canvas.drawImageResource(mImgRes[index],x,y+10);
699699
x+=33;
700700
if(isSec)
701-
canvas.setTextColor(RGB(255,149,0));
701+
canvas.setTextColor(COLOR_PLAY_ORANGE);
702702
else
703703
canvas.setTextColor(COLOR_TEXT);
704704
canvas.setTextSize(18);
@@ -728,7 +728,7 @@ namespace mango
728728
canvas.drawImageResource(mImgRes[index],x,y+10);
729729
x+=33;
730730
if(isSec)
731-
canvas.setTextColor(RGB(255,149,0));
731+
canvas.setTextColor(COLOR_PLAY_ORANGE);
732732
else
733733
canvas.setTextColor(COLOR_TEXT);
734734
canvas.setTextSize(18);
@@ -757,7 +757,7 @@ namespace mango
757757
canvas.drawImageResource(mImgRes[index],x,y+10);
758758
x+=33;
759759
if(isSec)
760-
canvas.setTextColor(RGB(255,149,0));
760+
canvas.setTextColor(COLOR_PLAY_ORANGE);
761761
else
762762
canvas.setTextColor(COLOR_TEXT);
763763
canvas.setTextSize(18);
@@ -786,7 +786,7 @@ namespace mango
786786
canvas.drawImageResource(mImgRes[index],x,y+10);
787787
x+=33;
788788
if(isSec)
789-
canvas.setTextColor(RGB(255,149,0));
789+
canvas.setTextColor(COLOR_PLAY_ORANGE);
790790
else
791791
canvas.setTextColor(COLOR_TEXT);
792792
canvas.setTextSize(18);
@@ -816,7 +816,7 @@ namespace mango
816816
canvas.drawImageResource(mImgRes[index],x,y+10);
817817
x+=33;
818818
if(isSec)
819-
canvas.setTextColor(RGB(255,149,0));
819+
canvas.setTextColor(COLOR_PLAY_ORANGE);
820820
else
821821
canvas.setTextColor(COLOR_TEXT);
822822
canvas.setTextSize(18);

‎apps/player/mediaView.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,7 @@ namespace mango
13221322
x = LIST_MUSIC_ICON_LEFT;
13231323
canvas.drawImageResource(MediaView::getMusicIcon(info->path),x,y+5);
13241324
if(isSec)
1325-
canvas.setTextColor(RGB(255,149,0));
1325+
canvas.setTextColor(COLOR_PLAY_ORANGE);
13261326
else
13271327
canvas.setTextColor(COLOR_TEXT);
13281328
canvas.setTextSize(16);
@@ -1464,7 +1464,7 @@ namespace mango
14641464
x = LIST_MUSIC_ICON_LEFT;
14651465
canvas.drawImageResource(MediaView::getMusicIcon(info->path),x,y+5);
14661466
if(isSec)
1467-
canvas.setTextColor(RGB(255,149,0));
1467+
canvas.setTextColor(COLOR_PLAY_ORANGE);
14681468
else
14691469
canvas.setTextColor(COLOR_TEXT);
14701470
x= x+40;
@@ -1585,7 +1585,7 @@ namespace mango
15851585
canvas.drawImageResource(IDP_LISTICON_ALBUM,x,y+5);
15861586

15871587
if(isSec)
1588-
canvas.setTextColor(RGB(255,149,0));
1588+
canvas.setTextColor(COLOR_PLAY_ORANGE);
15891589
else
15901590
canvas.setTextColor(COLOR_TEXT);
15911591
canvas.setTextSize(16);
@@ -1634,7 +1634,7 @@ namespace mango
16341634
canvas.drawImageResource(IDP_LIST_GENRE_ICON,x,y+1);
16351635

16361636
if(isSec)
1637-
canvas.setTextColor(RGB(255,149,0));
1637+
canvas.setTextColor(COLOR_PLAY_ORANGE);
16381638
else
16391639
canvas.setTextColor(COLOR_TEXT);
16401640
canvas.setTextSize(18);
@@ -1692,7 +1692,7 @@ namespace mango
16921692
canvas.drawImageResource(IDP_LISTICON_ARTIST,x,y+5);
16931693

16941694
if(isSec)
1695-
canvas.setTextColor(RGB(255,149,0));
1695+
canvas.setTextColor(COLOR_PLAY_ORANGE);
16961696
else
16971697
canvas.setTextColor(COLOR_TEXT);
16981698

@@ -1720,7 +1720,7 @@ namespace mango
17201720
canvas.drawImageResource(mImgRes[index],x,y+10);
17211721
x+=33;
17221722
if(isSec)
1723-
canvas.setTextColor(RGB(255,149,0));
1723+
canvas.setTextColor(COLOR_PLAY_ORANGE);
17241724
else
17251725
canvas.setTextColor(COLOR_TEXT);
17261726
canvas.setTextSize(18);

‎apps/player/playingView.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ namespace mango
8585

8686
rect.setEx(left, 55, 188, 25);
8787
mMusicNameStatic = new StaticView(TEXT("mMusicName"), this, &rect, 0);
88-
mMusicNameStatic->setTextColor(RGB(248,136,0));
88+
mMusicNameStatic->setTextColor(COLOR_PLAY_ORANGE);
8989
mMusicNameStatic->setTextSize(23);
9090
mMusicNameStatic->setTextBkRes(IDP_PLAYING_MUSICNAME_BK);
9191

@@ -445,7 +445,7 @@ namespace mango
445445
//log_i("PlayingView::onPaint");
446446
Environment::drawWallpaper(canvas);
447447
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
448-
canvas.drawImageResource(IDP_BACKGROUND_BOTTOM, 0, 211, true);
448+
canvas.drawImageResource(IDP_BACKGROUND_BOTTOM, 1, 211, true);
449449

450450
//log_i("PlayingView::onPaint complete");
451451

‎apps/player/playlist.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ namespace mango
239239
y = rect.top;
240240

241241
if(isSec)
242-
canvas.setTextColor(RGB(255,149,0));
242+
canvas.setTextColor(COLOR_PLAY_ORANGE);
243243
else
244244
canvas.setTextColor(COLOR_TEXT);
245245

‎apps/player/resource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Module Name:
2121
2222
Revision History:
2323
24-
2014-3-31 17:13:23 Created by Fibo Lu
24+
2014-4-1 20:10:4 Created by Fibo Lu
2525
2626
--*/
2727

‎base/party/session.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -964,10 +964,7 @@ namespace mango
964964
}
965965
mLanguageId = langid;
966966

967-
if(mLanguageId == LANGID_SIMPLIFIED ||
968-
mLanguageId == LANGID_TRADITIONAL ||
969-
mLanguageId == LANGID_JAPANESE)
970-
gFontCache.resetCache();
967+
gFontCache.resetCache();
971968

972969
return true;
973970
}

‎base/view/viewZAxis.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ namespace mango
538538
View* view;
539539
int count;
540540
#if INVAL_COUNT
541-
View* invalidView[500];
541+
View* invalidView[500]={0};
542542
int invalidCount=0,i;
543543
#endif
544544
mMutex.lock() ;

‎include/mango/define.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
#define ARGB(a,r,g,b) ((COLORREF)(((BYTE)(b)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(r))<<16)|(((DWORD)(BYTE)(a))<<24)))
5555

5656
#define COLOR_ORANGE RGB(255,149,0)
57+
#define COLOR_PLAY_ORANGE RGB(245,164,92)
5758
#define COLOR_GRAY RGB(180,180,180)
5859
#define COLOR_WHITE RGB(255,255,255)
5960
#define COLOR_BLACK RGB(0,0,0)

0 commit comments

Comments
 (0)