From eca0dd68cae4a3b05d734a317e7995c6f575429c Mon Sep 17 00:00:00 2001 From: Flamefire Date: Fri, 24 Oct 2014 22:54:11 +0200 Subject: [PATCH] Make SReflection a nullable --- .../Screens/PartyScreenChallengeConfig.xml | 11 +- .../Screens/PartyScreenChallengeMain.xml | 53 +----- .../Screens/PartyScreenChallengeNames.xml | 31 +--- .../PartyScreenChallengeMedleyConfig.xml | 11 +- .../PartyScreenChallengeMedleyMain.xml | 53 +----- .../PartyScreenChallengeMedleyNames.xml | 31 +--- .../Screens/PartyScreenTicTacToeConfig.xml | 11 +- .../Screens/PartyScreenTicTacToeMain.xml | 52 +----- .../Screens/PartyScreenTicTacToeNames.xml | 31 +--- .../Screens/PopupScreenPlayerControl.xml | 43 +---- .../Ambient/Screens/PopupScreenServerQR.xml | 13 -- .../Screens/PopupScreenVolumeControl.xml | 2 - .../Ambient/Screens/ScreenHighscore.xml | 45 ----- Output/Themes/Ambient/Screens/ScreenLoad.xml | 4 - Output/Themes/Ambient/Screens/ScreenMain.xml | 19 +- Output/Themes/Ambient/Screens/ScreenNames.xml | 36 +--- .../Themes/Ambient/Screens/ScreenOptions.xml | 20 +- .../Ambient/Screens/ScreenOptionsGame.xml | 20 +- .../Ambient/Screens/ScreenOptionsLyrics.xml | 7 +- .../Ambient/Screens/ScreenOptionsRecord.xml | 23 +-- .../Ambient/Screens/ScreenOptionsSound.xml | 10 +- .../Ambient/Screens/ScreenOptionsTheme.xml | 21 +-- .../Ambient/Screens/ScreenOptionsVideo.xml | 18 +- .../Screens/ScreenOptionsVideoAdjustments.xml | 9 +- Output/Themes/Ambient/Screens/ScreenParty.xml | 22 +-- .../Themes/Ambient/Screens/ScreenProfiles.xml | 46 +---- Output/Themes/Ambient/Screens/ScreenScore.xml | 130 ------------- Output/Themes/Ambient/Screens/ScreenSing.xml | 112 +----------- Output/Themes/Ambient/Screens/ScreenSong.xml | 172 +++++------------- VocaluxeLib/Menu/CButton.cs | 27 +-- VocaluxeLib/Menu/CEqualizer.cs | 14 +- VocaluxeLib/Menu/CStatic.cs | 14 +- VocaluxeLib/Menu/CText.cs | 12 +- VocaluxeLib/Structs.cs | 14 +- 34 files changed, 179 insertions(+), 958 deletions(-) diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml index 5093b839..27a75b5f 100644 --- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml +++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml @@ -24,7 +24,6 @@ 50 0 - @@ -41,7 +40,6 @@ Outline TR_SCREENCONFIG_TITLE - 75 @@ -56,7 +54,6 @@ Outline TR_SCREENCONFIG_NUMPLAYERS - 75 @@ -71,7 +68,6 @@ Outline TR_SCREENCONFIG_NUMMICS - 75 @@ -86,7 +82,6 @@ Outline TR_SCREENCONFIG_NUMROUNDS - @@ -115,8 +110,7 @@ Outline TR_BUTTON_NEXT - - + 26 10 @@ -151,8 +145,7 @@ Outline TR_BUTTON_BACK - - + 26 10 diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml index 36c2ef96..c69334fa 100644 --- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml +++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml @@ -24,7 +24,6 @@ 50 0 - PopupBG @@ -36,7 +35,6 @@ 720 -1 - @@ -48,7 +46,6 @@ 100 0 - @@ -65,7 +62,6 @@ Outline TR_SCREENMAIN_TITLE - 40 @@ -80,7 +76,6 @@ Outline TR_SCREENMAIN_TABLE_POS - 50 @@ -95,7 +90,6 @@ Outline TR_SCREENMAIN_TABLE_PLAYERNAME - 260 @@ -110,7 +104,6 @@ Outline TR_SCREENMAIN_TABLE_NUMPLAYED - 340 @@ -125,7 +118,6 @@ Outline TR_SCREENMAIN_TABLE_WON - 490 @@ -140,7 +132,6 @@ Outline TR_SCREENMAIN_TABLE_SINGPOINTS - 590 @@ -155,7 +146,6 @@ Outline TR_SCREENMAIN_TABLE_GAMEPOINTS - 0 @@ -170,7 +160,6 @@ Outline - 640 @@ -185,7 +174,6 @@ Outline TR_SCREENMAIN_POPUP_REALLYEXIT - 660 @@ -200,7 +188,6 @@ Outline 1) - 0 @@ -215,7 +202,6 @@ Outline - 0 @@ -230,7 +216,6 @@ Outline - 640 @@ -245,7 +230,6 @@ Outline TR_SCREENMAIN_FINISH - 640 @@ -260,7 +244,6 @@ Outline - 640 @@ -275,7 +258,6 @@ Outline TR_SCREENMAIN_NEXT_PLAYER - @@ -304,8 +286,7 @@ Outline TR_BUTTON_NEXT_ROUND - - + 26 10 @@ -340,8 +321,7 @@ Outline TR_BUTTON_BACK - - + 26 10 @@ -376,8 +356,7 @@ Outline TR_BUTTON_EXIT - - + 26 10 @@ -412,8 +391,7 @@ Outline TR_BUTTON_YES - - + 26 10 @@ -448,8 +426,7 @@ Outline TR_BUTTON_NO - - + 26 10 @@ -484,10 +461,7 @@ Outline - - - - + diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml index db082216..cdfbdc24 100644 --- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml +++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml @@ -24,7 +24,6 @@ 50 0 - @@ -41,7 +40,6 @@ Outline TR_SCREENNAMES_TITLE - @@ -70,8 +68,7 @@ Outline TR_BUTTON_BACK - - + 26 10 @@ -106,8 +103,7 @@ Outline TR_BUTTON_NEXT - - + 26 10 @@ -142,8 +138,7 @@ Outline TR_SCREENNAMES_BUTTON_RANDOM - - + 26 10 @@ -178,10 +173,7 @@ Outline - - - - + diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml index 5c48f22a..a98f3e3e 100644 --- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml +++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml @@ -24,7 +24,6 @@ 50 0 - @@ -41,7 +40,6 @@ Outline TR_SCREENCONFIG_TITLE - 75 @@ -56,7 +54,6 @@ Outline TR_SCREENCONFIG_NUMPLAYERS - 75 @@ -71,7 +68,6 @@ Outline TR_SCREENCONFIG_NUMMICS - 75 @@ -86,7 +82,6 @@ Outline TR_SCREENCONFIG_NUMROUNDS - @@ -115,8 +110,7 @@ Outline TR_BUTTON_NEXT - - + 26 10 @@ -151,8 +145,7 @@ Outline TR_BUTTON_BACK - - + 26 10 diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml index 13f07c7a..191b9601 100644 --- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml +++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml @@ -24,7 +24,6 @@ 50 0 - PopupBG @@ -36,7 +35,6 @@ 720 -1 - @@ -48,7 +46,6 @@ 100 0 - @@ -65,7 +62,6 @@ Outline TR_SCREENMAIN_TITLE - 40 @@ -80,7 +76,6 @@ Outline TR_SCREENMAIN_TABLE_POS - 50 @@ -95,7 +90,6 @@ Outline TR_SCREENMAIN_TABLE_PLAYERNAME - 260 @@ -110,7 +104,6 @@ Outline TR_SCREENMAIN_TABLE_NUMPLAYED - 340 @@ -125,7 +118,6 @@ Outline TR_SCREENMAIN_TABLE_WON - 490 @@ -140,7 +132,6 @@ Outline TR_SCREENMAIN_TABLE_SINGPOINTS - 590 @@ -155,7 +146,6 @@ Outline TR_SCREENMAIN_TABLE_GAMEPOINTS - 0 @@ -170,7 +160,6 @@ Outline - 640 @@ -185,7 +174,6 @@ Outline TR_SCREENMAIN_POPUP_REALLYEXIT - 660 @@ -200,7 +188,6 @@ Outline 1) - 0 @@ -215,7 +202,6 @@ Outline - 0 @@ -230,7 +216,6 @@ Outline - 640 @@ -245,7 +230,6 @@ Outline TR_SCREENMAIN_FINISH - 640 @@ -260,7 +244,6 @@ Outline - 640 @@ -275,7 +258,6 @@ Outline TR_SCREENMAIN_NEXT_PLAYER - @@ -304,8 +286,7 @@ Outline TR_BUTTON_NEXT_ROUND - - + 26 10 @@ -340,8 +321,7 @@ Outline TR_BUTTON_BACK - - + 26 10 @@ -376,8 +356,7 @@ Outline TR_BUTTON_EXIT - - + 26 10 @@ -412,8 +391,7 @@ Outline TR_BUTTON_YES - - + 26 10 @@ -448,8 +426,7 @@ Outline TR_BUTTON_NO - - + 26 10 @@ -484,10 +461,7 @@ Outline - - - - + diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml index 8d574eae..d0527566 100644 --- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml +++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml @@ -24,7 +24,6 @@ 50 0 - @@ -41,7 +40,6 @@ Outline TR_SCREENNAMES_TITLE - @@ -70,8 +68,7 @@ Outline TR_BUTTON_BACK - - + 26 10 @@ -106,8 +103,7 @@ Outline TR_BUTTON_NEXT - - + 26 10 @@ -142,8 +138,7 @@ Outline TR_SCREENNAMES_BUTTON_RANDOM - - + 26 10 @@ -178,10 +173,7 @@ Outline - - - - + diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml index 435070b7..6bd64720 100644 --- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml +++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml @@ -24,7 +24,6 @@ 50 0 - @@ -41,7 +40,6 @@ Outline TR_SCREENCONFIG_TITLE - 75 @@ -56,7 +54,6 @@ Outline TR_SCREENCONFIG_NUMFIELDS - 75 @@ -71,7 +68,6 @@ Outline TR_SCREENCONFIG_SONGSOURCE - 75 @@ -86,7 +82,6 @@ Outline TR_SCREENCONFIG_GAMEMODE - @@ -115,8 +110,7 @@ Outline TR_BUTTON_NEXT - - + 26 10 @@ -151,8 +145,7 @@ Outline TR_BUTTON_BACK - - + 26 10 diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml index 42a331f8..87c4e8e4 100644 --- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml +++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml @@ -24,7 +24,6 @@ 50 0 - PopupBG @@ -36,7 +35,6 @@ 720 -2 - PopupBG @@ -48,7 +46,6 @@ 100 -1 - PopupBG @@ -60,7 +57,6 @@ 100 -1 - @@ -77,7 +73,6 @@ Outline TR_SCREENMAIN_TITLE - 640 @@ -92,7 +87,6 @@ Outline TR_SCREENMAIN_POPUP_REALLYEXIT - 640 @@ -107,7 +101,6 @@ Outline - 640 @@ -122,7 +115,6 @@ Outline - 160 @@ -137,7 +129,6 @@ Outline TR_SCREENMAIN_NEXT_PLAYER - 1120 @@ -152,7 +143,6 @@ Outline TR_SCREENMAIN_NEXT_PLAYER - 120 @@ -167,7 +157,6 @@ Outline - 1160 @@ -182,7 +171,6 @@ Outline - @@ -211,8 +199,7 @@ Outline TR_BUTTON_NEXT_ROUND - - + 26 10 @@ -247,8 +234,7 @@ Outline TR_BUTTON_BACK - - + 26 10 @@ -283,8 +269,7 @@ Outline TR_BUTTON_EXIT - - + 26 10 @@ -319,8 +304,7 @@ Outline TR_BUTTON_YES - - + 26 10 @@ -355,8 +339,7 @@ Outline TR_BUTTON_NO - - + 26 10 @@ -391,10 +374,7 @@ Outline - - - - + diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml index 4e4bdf94..fcdf3408 100644 --- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml +++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml @@ -24,7 +24,6 @@ 50 0 - @@ -41,7 +40,6 @@ Outline TR_SCREENNAMES_TITLE - @@ -70,8 +68,7 @@ Outline TR_BUTTON_BACK - - + 26 10 @@ -106,8 +103,7 @@ Outline TR_BUTTON_NEXT - - + 26 10 @@ -142,8 +138,7 @@ Outline TR_SCREENNAMES_BUTTON_RANDOM - - + 26 10 @@ -178,10 +173,7 @@ Outline - - - - + diff --git a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml index be7f5664..bc874bd7 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml +++ b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml @@ -16,7 +16,6 @@ 42 0 - CoverBackground @@ -28,7 +27,6 @@ 38 0 - @@ -45,7 +43,6 @@ Outline - @@ -74,10 +71,7 @@ Normal - - - - + diff --git a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml index adb7adcd..dd0d120f 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml +++ b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml @@ -21,7 +21,6 @@ 720 -1.99 - Menu @@ -33,7 +32,6 @@ 300 -2 - Menu @@ -45,7 +43,6 @@ 200 -2 - Menu @@ -57,7 +54,6 @@ 200 -2 - Menu @@ -69,7 +65,6 @@ 200 -2 - Menu @@ -81,7 +76,6 @@ 200 -2 - @@ -98,7 +92,6 @@ Outline TR_SCREENPSERVERQR_ADDRESS - 125 @@ -113,7 +106,6 @@ Outline Android - 1155 @@ -128,7 +120,6 @@ Outline Symbian - 125 @@ -143,7 +134,6 @@ Outline WebOS - 1155 @@ -158,7 +148,6 @@ Outline Windows Phone - 640 @@ -173,7 +162,6 @@ Outline - 640 @@ -188,7 +176,6 @@ Outline TR_SCREENPSERVERQR_NOTRUNNING - diff --git a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml index 533e31fe..1bb2bfdd 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml +++ b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml @@ -16,7 +16,6 @@ 48 -2 - @@ -33,7 +32,6 @@ Outline TR_SCREENPVOLUMECONTROL_VOLUME - diff --git a/Output/Themes/Ambient/Screens/ScreenHighscore.xml b/Output/Themes/Ambient/Screens/ScreenHighscore.xml index 2a9afe3a..4e997947 100644 --- a/Output/Themes/Ambient/Screens/ScreenHighscore.xml +++ b/Output/Themes/Ambient/Screens/ScreenHighscore.xml @@ -24,7 +24,6 @@ 50 0 - TextBG @@ -36,7 +35,6 @@ 610 0 - @@ -53,7 +51,6 @@ Outline TR_SCREENHIGHSCORE_HIGHSCORE - 640 @@ -68,7 +65,6 @@ Outline - 1220 @@ -83,7 +79,6 @@ Outline - 120 @@ -98,7 +93,6 @@ Outline - 120 @@ -113,7 +107,6 @@ Outline - 120 @@ -128,7 +121,6 @@ Outline - 120 @@ -143,7 +135,6 @@ Outline - 120 @@ -158,7 +149,6 @@ Outline - 120 @@ -173,7 +163,6 @@ Outline - 120 @@ -188,7 +177,6 @@ Outline - 120 @@ -203,7 +191,6 @@ Outline - 120 @@ -218,7 +205,6 @@ Outline - 120 @@ -233,7 +219,6 @@ Outline - 200 @@ -248,7 +233,6 @@ Outline - 200 @@ -263,7 +247,6 @@ Outline - 200 @@ -278,7 +261,6 @@ Outline - 200 @@ -293,7 +275,6 @@ Outline - 200 @@ -308,7 +289,6 @@ Outline - 200 @@ -323,7 +303,6 @@ Outline - 200 @@ -338,7 +317,6 @@ Outline - 200 @@ -353,7 +331,6 @@ Outline - 200 @@ -368,7 +345,6 @@ Outline - 200 @@ -383,7 +359,6 @@ Outline - 800 @@ -398,7 +373,6 @@ Outline - 800 @@ -413,7 +387,6 @@ Outline - 800 @@ -428,7 +401,6 @@ Outline - 800 @@ -443,7 +415,6 @@ Outline - 800 @@ -458,7 +429,6 @@ Outline - 800 @@ -473,7 +443,6 @@ Outline - 800 @@ -488,7 +457,6 @@ Outline - 800 @@ -503,7 +471,6 @@ Outline - 800 @@ -518,7 +485,6 @@ Outline - 800 @@ -533,7 +499,6 @@ Outline - 1000 @@ -548,7 +513,6 @@ Outline - 1000 @@ -563,7 +527,6 @@ Outline - 1000 @@ -578,7 +541,6 @@ Outline - 1000 @@ -593,7 +555,6 @@ Outline - 1000 @@ -608,7 +569,6 @@ Outline - 1000 @@ -623,7 +583,6 @@ Outline - 1000 @@ -638,7 +597,6 @@ Outline - 1000 @@ -653,7 +611,6 @@ Outline - 1000 @@ -668,7 +625,6 @@ Outline - 1000 @@ -683,7 +639,6 @@ Outline - diff --git a/Output/Themes/Ambient/Screens/ScreenLoad.xml b/Output/Themes/Ambient/Screens/ScreenLoad.xml index 0c27412a..164888a9 100644 --- a/Output/Themes/Ambient/Screens/ScreenLoad.xml +++ b/Output/Themes/Ambient/Screens/ScreenLoad.xml @@ -24,7 +24,6 @@ 50 0 - @@ -41,7 +40,6 @@ Outline TR_SCREENLOAD_LOADING - 240 @@ -56,7 +54,6 @@ Outline Gesamt: 168 Lieder (168 geladen) - 640 @@ -71,7 +68,6 @@ Outline TR_PROGRAM_NAME - diff --git a/Output/Themes/Ambient/Screens/ScreenMain.xml b/Output/Themes/Ambient/Screens/ScreenMain.xml index 2f1f310d..80ed68fa 100644 --- a/Output/Themes/Ambient/Screens/ScreenMain.xml +++ b/Output/Themes/Ambient/Screens/ScreenMain.xml @@ -24,7 +24,6 @@ 50 0 - TextBG @@ -36,7 +35,6 @@ 30 -1.9 - @@ -53,7 +51,6 @@ Normal Vocaluxe "Shining Heaven" v0.3.0 (x64) Beta (0083) - 320 @@ -68,7 +65,6 @@ Outline TR_SCREENMAIN_TEXT_NOPROFILES - @@ -97,8 +93,7 @@ Outline TR_SCREENMAIN_BUTTON_SING - - + 26 10 @@ -133,8 +128,7 @@ Outline TR_SCREENMAIN_BUTTON_PARTY - - + 26 10 @@ -169,8 +163,7 @@ Outline TR_SCREENMAIN_BUTTON_OPTIONS - - + 26 10 @@ -205,8 +198,7 @@ Outline TR_SCREENMAIN_BUTTON_PROFILES - - + 26 10 @@ -241,8 +233,7 @@ Outline TR_BUTTON_EXIT - - + 26 10 diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml index 34d4f3b3..4c34f9da 100644 --- a/Output/Themes/Ambient/Screens/ScreenNames.xml +++ b/Output/Themes/Ambient/Screens/ScreenNames.xml @@ -24,7 +24,6 @@ 50 0 - @@ -36,7 +35,6 @@ 108 -3 - @@ -48,7 +46,6 @@ 108 -3 - @@ -60,7 +57,6 @@ 108 -3 - @@ -72,7 +68,6 @@ 108 -3 - @@ -84,7 +79,6 @@ 108 -3 - @@ -96,7 +90,6 @@ 108 -3 - PlayerSelector @@ -108,7 +101,6 @@ 118 -2 - PlayerSelector @@ -120,7 +112,6 @@ 118 -2 - PlayerSelector @@ -132,7 +123,6 @@ 118 -2 - PlayerSelector @@ -144,7 +134,6 @@ 118 -2 - PlayerSelector @@ -156,7 +145,6 @@ 118 -2 - PlayerSelector @@ -168,7 +156,6 @@ 118 -2 - @@ -180,7 +167,6 @@ 50 0 - @@ -192,7 +178,6 @@ 50 0 - @@ -209,7 +194,6 @@ Outline TR_SCREENNAMES_MENU - 640 @@ -224,7 +208,6 @@ Outline - 640 @@ -239,7 +222,6 @@ Outline - 74 @@ -254,7 +236,6 @@ Outline - 74 @@ -269,7 +250,6 @@ Outline - 74 @@ -284,7 +264,6 @@ Outline - 1206 @@ -299,7 +278,6 @@ Outline - 1206 @@ -314,7 +292,6 @@ Outline - 1206 @@ -329,7 +306,6 @@ Outline - @@ -358,8 +334,7 @@ Outline TR_BUTTON_BACK - - + 26 10 @@ -394,8 +369,7 @@ Outline TR_BUTTON_START - - + 26 10 @@ -755,7 +729,6 @@ TR_CONFIG_OFF 0.4 0.4 - @@ -772,7 +745,6 @@ TR_CONFIG_OFF 0.4 0.4 - @@ -789,7 +761,6 @@ TR_CONFIG_OFF 0.4 0.4 - @@ -806,7 +777,6 @@ TR_CONFIG_OFF 0.4 0.4 - @@ -823,7 +793,6 @@ TR_CONFIG_OFF 0.4 0.4 - @@ -840,7 +809,6 @@ TR_CONFIG_OFF 0.4 0.4 - diff --git a/Output/Themes/Ambient/Screens/ScreenOptions.xml b/Output/Themes/Ambient/Screens/ScreenOptions.xml index aa7605b0..f981d51b 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptions.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptions.xml @@ -24,7 +24,6 @@ 50 0 - @@ -41,7 +40,6 @@ Outline TR_SCREENO_OPTIONS - @@ -70,8 +68,7 @@ Outline TR_SCREENO_BUTTON_GAME - - + 26 10 @@ -106,8 +103,7 @@ Outline TR_SCREENO_BUTTON_SOUND - - + 26 10 @@ -142,8 +138,7 @@ Outline TR_SCREENO_BUTTON_RECORD - - + 26 10 @@ -178,8 +173,7 @@ Outline TR_SCREENO_BUTTON_VIDEO - - + 26 10 @@ -214,8 +208,7 @@ Outline TR_SCREENO_BUTTON_LYRICS - - + 26 10 @@ -250,8 +243,7 @@ Outline TR_SCREENO_BUTTON_THEME - - + 26 10 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml index 065cff21..84605003 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml @@ -24,7 +24,6 @@ 50 0 - @@ -36,7 +35,6 @@ 50 0 - @@ -48,7 +46,6 @@ 50 0 - @@ -60,7 +57,6 @@ 50 0 - @@ -72,7 +68,6 @@ 50 0 - @@ -84,7 +79,6 @@ 50 0 - @@ -96,7 +90,6 @@ 50 0 - @@ -113,7 +106,6 @@ Outline TR_SCREENOGAME_OPTIONS - 75 @@ -128,7 +120,6 @@ Outline TR_SCREENOGAME_LANGUAGE - 75 @@ -143,7 +134,6 @@ Outline TR_SCREENOGAME_DEBUGLEVEL - 75 @@ -158,7 +148,6 @@ Outline TR_SCREENOGAME_SONGMENU - 75 @@ -173,7 +162,6 @@ Outline TR_SCREENOGAME_SONGSORTING - 75 @@ -188,7 +176,6 @@ Outline TR_SCREENOGAME_TABS - 75 @@ -203,7 +190,6 @@ Outline TR_SCREENOGAME_TIMERMODE - @@ -232,8 +218,7 @@ Outline TR_BUTTON_BACK - - + 26 10 @@ -268,8 +253,7 @@ Outline TR_SCREENOGAME_BUTTON_SERVER - - + 26 10 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml index b7956f6c..01c36cc7 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml @@ -24,7 +24,6 @@ 50 0 - @@ -41,7 +40,6 @@ Outline TR_SCREENOLYRICS_OPTIONS - 75 @@ -56,7 +54,6 @@ Outline TR_SCREENOLYRICS_STYLE - 75 @@ -71,7 +68,6 @@ Outline TR_SCREENOLYRICS_POSITION - @@ -100,8 +96,7 @@ Outline TR_BUTTON_BACK - - + 26 10 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml index c7ebf411..14895568 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml @@ -24,7 +24,6 @@ 50 0 - @@ -36,7 +35,6 @@ 50 0 - @@ -48,7 +46,6 @@ 50 0 - @@ -60,7 +57,6 @@ 50 0 - @@ -72,7 +68,6 @@ 50 0 - @@ -84,7 +79,6 @@ 50 0 - @@ -96,7 +90,6 @@ 50 0 - EnergyBeam @@ -108,7 +101,6 @@ 16 0 - EnergyBeam @@ -120,7 +112,6 @@ 16 0 - @@ -137,7 +128,6 @@ Outline TR_SCREENORECORD_OPTIONS - 75 @@ -152,7 +142,6 @@ Outline TR_SCREENORECORD_DEVICE - 75 @@ -167,7 +156,6 @@ Outline TR_SCREENORECORD_MIC_DELAY - 640 @@ -182,7 +170,6 @@ Outline TR_SCREENORECORD_MIC_WARNING - 75 @@ -197,7 +184,6 @@ Outline TR_SCREENORECORD_CHANNEL_1 - 75 @@ -212,7 +198,6 @@ Outline TR_SCREENORECORD_CHANNEL_2 - 330 @@ -227,7 +212,6 @@ Outline - 330 @@ -242,7 +226,6 @@ Outline - @@ -271,8 +254,7 @@ Outline TR_BUTTON_BACK - - + 26 10 @@ -307,8 +289,7 @@ Outline TR_SCREENORECORD_BUTTON_DELAYTEST - - + 26 10 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml index 617668f3..ac3080e0 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml @@ -24,7 +24,6 @@ 50 0 - @@ -41,7 +40,6 @@ Outline TR_SCREENOSOUND_OPTIONS - 75 @@ -56,7 +54,6 @@ Outline TR_SCREENOSOUND_BACKGROUNDMUSIC - 75 @@ -71,7 +68,6 @@ Outline TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME - 75 @@ -86,7 +82,6 @@ Outline TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE - 75 @@ -101,7 +96,6 @@ Outline TR_SCREENOSOUND_PREVIEWMUSICVOLUME - 75 @@ -116,7 +110,6 @@ Outline TR_SCREENOSOUND_GAMEMUSICVOLUME - @@ -145,8 +138,7 @@ Outline TR_BUTTON_BACK - - + 26 10 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml index ca59f348..3a8f923a 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml @@ -24,7 +24,6 @@ 50 0 - @@ -36,7 +35,6 @@ 50 0 - @@ -48,7 +46,6 @@ 50 0 - @@ -60,7 +57,6 @@ 50 0 - @@ -72,7 +68,6 @@ 50 0 - @@ -84,7 +79,6 @@ 50 0 - @@ -96,7 +90,6 @@ 50 0 - @@ -108,7 +101,6 @@ 50 0 - @@ -120,7 +112,6 @@ 50 0 - @@ -137,7 +128,6 @@ Outline TR_SCREENOTHEME_OPTIONS - 75 @@ -152,7 +142,6 @@ Outline TR_SCREENOTHEME_THEME - 75 @@ -167,7 +156,6 @@ Outline TR_SCREENOTHEME_SKIN - 75 @@ -182,7 +170,6 @@ Outline TR_SCREENOTHEME_COVERTHEME - 75 @@ -197,7 +184,6 @@ Outline TR_SCREENOTHEME_NOTELINES - 75 @@ -212,7 +198,6 @@ Outline TR_SCREENOTHEME_TONEHELPER - 75 @@ -227,7 +212,6 @@ Outline TR_SCREENOTHEME_TIMERLOOK - 75 @@ -242,7 +226,6 @@ Outline TR_SCREENOTHEME_FADEINFO - 75 @@ -257,7 +240,6 @@ Outline TR_SCREENOTHEME_COVERLOADING - @@ -286,8 +268,7 @@ Outline TR_BUTTON_BACK - - + 26 10 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml index 5c393f9b..8ea10e0a 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml @@ -24,7 +24,6 @@ 50 0 - @@ -36,7 +35,6 @@ 50 0 - @@ -48,7 +46,6 @@ 50 0 - @@ -60,7 +57,6 @@ 50 0 - @@ -72,7 +68,6 @@ 240 0 - @@ -89,7 +84,6 @@ Outline TR_SCREENOVIDEO_OPTIONS - 75 @@ -104,7 +98,6 @@ Outline TR_SCREENOVIDEO_VIDEOBACKGROUNDS - 75 @@ -119,7 +112,6 @@ Outline TR_SCREENOVIDEO_VIDEOPREVIEW - 75 @@ -134,7 +126,6 @@ Outline TR_SCREENOVIDEO_VIDEOINSONGS - 75 @@ -149,7 +140,6 @@ Outline TR_SCREENOVIDEO_VIDEOSTOBACKGROUND - 75 @@ -164,7 +154,6 @@ Outline TR_SCREENOVIDEO_WEBCAMDEVICES - 75 @@ -179,7 +168,6 @@ Outline TR_SCREENOVIDEO_WEBCAMRESOLUTION - @@ -208,8 +196,7 @@ Outline TR_BUTTON_BACK - - + 26 10 @@ -244,8 +231,7 @@ Outline TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS - - + 26 10 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml index 8f7276dd..e9e89442 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml @@ -33,7 +33,6 @@ Outline TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT - 1280 @@ -48,7 +47,6 @@ Outline TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT - 0 @@ -63,7 +61,6 @@ Outline TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT - 1280 @@ -78,7 +75,6 @@ Outline TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT - 640 @@ -93,7 +89,6 @@ Outline TR_SCREENOVIDEOADJUSTMENTS_NOTES - 640 @@ -108,7 +103,6 @@ Outline TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET - @@ -137,8 +131,7 @@ Outline TR_BUTTON_BACK - - + 26 10 diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml index c8e08757..29d18387 100644 --- a/Output/Themes/Ambient/Screens/ScreenParty.xml +++ b/Output/Themes/Ambient/Screens/ScreenParty.xml @@ -24,7 +24,6 @@ 50 0 - @@ -41,7 +40,6 @@ Outline TR_SCREENPARTY_TITLE - 75 @@ -56,7 +54,6 @@ Outline TR_SCREENPARTY_MODES - 75 @@ -71,7 +68,6 @@ Outline TR_SCREENPARTY_DESCRIPTION - 75 @@ -86,7 +82,6 @@ Outline TR_SCREENPARTY_TARGETAUDIENCE - 75 @@ -101,7 +96,6 @@ Outline TR_SCREENPARTY_NUMTEAMS - 75 @@ -116,7 +110,6 @@ Outline TR_SCREENPARTY_NUMPLAYERS - 75 @@ -131,7 +124,6 @@ Outline TR_SCREENPARTY_AUTHOR - 75 @@ -146,7 +138,6 @@ Outline TR_SCREENPARTY_VERSION - 850 @@ -161,7 +152,6 @@ Outline - 850 @@ -176,7 +166,6 @@ Outline - 850 @@ -191,7 +180,6 @@ Outline - 850 @@ -206,7 +194,6 @@ Outline - 850 @@ -221,7 +208,6 @@ Outline - 850 @@ -236,7 +222,6 @@ Outline - 850 @@ -251,7 +236,6 @@ Outline TR_SCREENPARTY_ERROR - @@ -280,8 +264,7 @@ Outline TR_BUTTON_START - - + 26 10 @@ -316,8 +299,7 @@ Outline TR_BUTTON_BACK - - + 26 10 diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml index ecf77a37..cfa5141f 100644 --- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml +++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml @@ -24,7 +24,6 @@ 50 0 - @@ -36,7 +35,6 @@ 50 0 - @@ -48,7 +46,6 @@ 50 0 - @@ -60,7 +57,6 @@ 50 0 - @@ -72,7 +68,6 @@ 50 0 - @@ -84,7 +79,6 @@ 50 0 - @@ -96,7 +90,6 @@ 160 0 - @@ -113,7 +106,6 @@ Outline TR_SCREENPROFILES_PROFILES - 75 @@ -128,7 +120,6 @@ Outline TR_SCREENPROFILES_PLAYERNAME - 75 @@ -143,7 +134,6 @@ Outline TR_SCREENPROFILES_GAMEDIFFICULTY - 75 @@ -158,7 +148,6 @@ Outline TR_SCREENPROFILES_AVATAR - 75 @@ -173,7 +162,6 @@ Outline TR_SCREENPROFILES_USERROLE - 75 @@ -188,7 +176,6 @@ Outline TR_SCREENPROFILES_ACTIVE - @@ -217,10 +204,7 @@ Outline - - - - + @@ -826,8 +764,7 @@ Outline - - + 222 456 @@ -841,8 +778,7 @@ Outline - - + 222 490 @@ -856,8 +792,7 @@ Outline - - + CoverBackground @@ -868,8 +803,7 @@ 360 -1 - - + CoverBackground @@ -880,8 +814,7 @@ 550 -1 - - + DuetIcon @@ -892,8 +825,7 @@ 40 -1 - - + VideoIcon @@ -904,8 +836,7 @@ 40 -1 - - + MedleyCalcIcon @@ -916,8 +847,7 @@ 40 -1 - - + MedleyTagIcon @@ -928,8 +858,7 @@ 40 -1 - - + @@ -1134,8 +1063,7 @@ Outline TR_SCREENSONG_ARTIST_TITLE - - + @@ -1146,8 +1074,7 @@ 46 -1 - - + Menu @@ -1158,8 +1085,7 @@ 40 -1 - - + Menu @@ -1170,8 +1096,7 @@ 40 -1 - - + @@ -1197,11 +1122,8 @@ Outline - - - - - + + CloseIcon CloseIcon @@ -1227,11 +1149,8 @@ Outline - - - - - + + SaveIcon SaveIcon @@ -1257,11 +1176,8 @@ Outline - - - - - + + DeleteIcon DeleteIcon @@ -1287,11 +1203,8 @@ Outline - - - - - + + SingIcon SingIcon @@ -1317,11 +1230,8 @@ Outline - - - - - + + Button SelectSlideArrowLeft diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs index 258f480e..b2eafdff 100644 --- a/VocaluxeLib/Menu/CButton.cs +++ b/VocaluxeLib/Menu/CButton.cs @@ -16,6 +16,7 @@ #endregion using System; +using System.Diagnostics; using System.Xml.Serialization; using VocaluxeLib.Draw; using VocaluxeLib.Xml; @@ -35,8 +36,8 @@ namespace VocaluxeLib.Menu public SThemeText Text; public SThemeText SelText; [XmlIgnore] public bool SelTextSpecified; - public SReflection Reflection; - public SReflection SelReflection; + public SReflection? Reflection; + public SReflection? SelReflection; } public sealed class CButton : CMenuElementBase, IMenuElement, IThemeable @@ -209,12 +210,12 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref _ReflectionSpace); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref _ReflectionHeight); - _Theme.Reflection = new SReflection(true, _ReflectionHeight, _ReflectionSpace); + _Theme.Reflection = new SReflection(_ReflectionHeight, _ReflectionSpace); } else { _Reflection = false; - _Theme.Reflection = new SReflection(false, 0f, 0f); + _Theme.Reflection = null; } if (xmlReader.ItemExists(item + "/SReflection")) @@ -223,12 +224,12 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SReflection/Space", ref _SelReflectionSpace); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SReflection/Height", ref _SelReflectionHeight); - _Theme.SelReflection = new SReflection(true, _SelReflectionHeight, _SelReflectionSpace); + _Theme.SelReflection = new SReflection(_SelReflectionHeight, _SelReflectionSpace); } else { _SelReflection = false; - _Theme.SelReflection = new SReflection(false, 0f, 0f); + _Theme.SelReflection = null; } if (_ThemeLoaded) @@ -321,18 +322,20 @@ namespace VocaluxeLib.Menu MaxRect = _Theme.Rect; - _Reflection = _Theme.Reflection.Enabled; + _Reflection = _Theme.Reflection.HasValue; if (_Reflection) { - _ReflectionHeight = _Theme.Reflection.Height; - _ReflectionSpace = _Theme.Reflection.Space; + Debug.Assert(_Theme.Reflection != null); + _ReflectionHeight = _Theme.Reflection.Value.Height; + _ReflectionSpace = _Theme.Reflection.Value.Space; } - _SelReflection = _Theme.Reflection.Enabled; + _SelReflection = _Theme.Reflection.HasValue; if (_SelReflection) { - _SelReflectionHeight = _Theme.SelReflection.Height; - _SelReflectionSpace = _Theme.SelReflection.Space; + Debug.Assert(_Theme.SelReflection != null); + _SelReflectionHeight = _Theme.SelReflection.Value.Height; + _SelReflectionSpace = _Theme.SelReflection.Value.Space; } if (_Theme.Rect.Z < Text.Z) diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs index 8e3892ba..aa9e76da 100644 --- a/VocaluxeLib/Menu/CEqualizer.cs +++ b/VocaluxeLib/Menu/CEqualizer.cs @@ -16,6 +16,7 @@ #endregion using System; +using System.Diagnostics; using System.Xml.Serialization; using VocaluxeLib.Xml; @@ -42,7 +43,7 @@ namespace VocaluxeLib.Menu public SThemeColor Color; public SThemeColor MaxColor; - public SReflection Reflection; + public SReflection? Reflection; } public class CEqualizer : CMenuElementBase, IMenuElement, IThemeable @@ -148,12 +149,12 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); - _Theme.Reflection = new SReflection(true, ReflectionHeight, ReflectionSpace); + _Theme.Reflection = new SReflection( ReflectionHeight, ReflectionSpace); } else { Reflection = false; - _Theme.Reflection = new SReflection(false, 0f, 0f); + _Theme.Reflection = null; } if (_ThemeLoaded) @@ -244,11 +245,12 @@ namespace VocaluxeLib.Menu MaxRect = _Theme.Rect; Space = _Theme.Space; - Reflection = _Theme.Reflection.Enabled; + Reflection = _Theme.Reflection.HasValue; if (Reflection) { - ReflectionHeight = _Theme.Reflection.Height; - ReflectionSpace = _Theme.Reflection.Space; + Debug.Assert(_Theme.Reflection != null); + ReflectionHeight = _Theme.Reflection.Value.Height; + ReflectionSpace = _Theme.Reflection.Value.Space; } _Bars = new float[_Theme.NumBars]; diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs index c71175a6..475b962a 100644 --- a/VocaluxeLib/Menu/CStatic.cs +++ b/VocaluxeLib/Menu/CStatic.cs @@ -16,6 +16,7 @@ #endregion using System; +using System.Diagnostics; using System.Xml.Serialization; using VocaluxeLib.Draw; using VocaluxeLib.Xml; @@ -29,7 +30,7 @@ namespace VocaluxeLib.Menu public string Skin; public SThemeColor Color; public SRectF Rect; - public SReflection Reflection; + public SReflection? Reflection; } public sealed class CStatic : CMenuElementBase, IMenuElement, IThemeable @@ -147,12 +148,12 @@ namespace VocaluxeLib.Menu Reflection = true; _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); - _Theme.Reflection = new SReflection(true, ReflectionHeight, ReflectionSpace); + _Theme.Reflection = new SReflection(ReflectionHeight, ReflectionSpace); } else { Reflection = false; - _Theme.Reflection = new SReflection(false, 0f, 0f); + _Theme.Reflection = null; } if (_ThemeLoaded) @@ -198,11 +199,12 @@ namespace VocaluxeLib.Menu _Theme.Color.Get(_PartyModeID, out Color); MaxRect = _Theme.Rect; - Reflection = _Theme.Reflection.Enabled; + Reflection = _Theme.Reflection.HasValue; if (Reflection) { - ReflectionSpace = _Theme.Reflection.Space; - ReflectionHeight = _Theme.Reflection.Height; + Debug.Assert(_Theme.Reflection != null); + ReflectionSpace = _Theme.Reflection.Value.Space; + ReflectionHeight = _Theme.Reflection.Value.Height; } } diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index 4b12de23..094ff333 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -39,7 +39,7 @@ namespace VocaluxeLib.Menu [XmlElement("Style")] public EStyle FontStyle; [XmlElement("Font")] public string FontFamily; public string Text; - public SReflection Reflection; + public SReflection? Reflection; } public sealed class CText : CMenuElementBase, IMenuElement, IThemeable, IFontObserver @@ -350,10 +350,10 @@ namespace VocaluxeLib.Menu { _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref _ReflectionSpace); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref _ReflectionHeight); - _Theme.Reflection = new SReflection(true, _ReflectionHeight, _ReflectionSpace); + _Theme.Reflection = new SReflection(_ReflectionHeight, _ReflectionSpace); } else - _Theme.Reflection = new SReflection(false, 0f, 0f); + _Theme.Reflection = null; // Set values @@ -449,10 +449,10 @@ namespace VocaluxeLib.Menu _ResizeAlign = _Theme.ResizeAlign; Font = new CFont(_Theme.FontFamily, _Theme.FontStyle, _Theme.FontHeight); - if (_Theme.Reflection.Enabled) + if (_Theme.Reflection.HasValue) { - _ReflectionSpace = _Theme.Reflection.Space; - _ReflectionHeight = _Theme.Reflection.Height; + _ReflectionSpace = _Theme.Reflection.Value.Space; + _ReflectionHeight = _Theme.Reflection.Value.Height; } Text = _Theme.Text; diff --git a/VocaluxeLib/Structs.cs b/VocaluxeLib/Structs.cs index 6b9b0828..db67c872 100644 --- a/VocaluxeLib/Structs.cs +++ b/VocaluxeLib/Structs.cs @@ -237,23 +237,11 @@ namespace VocaluxeLib [XmlRoot("Reflection")] public struct SReflection { - [XmlAttribute] public bool Enabled; public float Height; public float Space; - //Needed for serialization - public bool HeightSpecified + public SReflection(float height, float space) { - get { return Enabled; } - } - public bool SpaceSpecified - { - get { return Enabled; } - } - - public SReflection(bool enabled, float height, float space) - { - Enabled = enabled; Height = height; Space = space; }