Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for profile-screen.

Browse Source
This commit is contained in:
Florian Kuepper committed 2012-12-08 15:08:02 +01:00
1 parent f005ba1376
commit d6d29d5334
2 files changed
+11 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Ambient/Screens/ScreenProfiles.xml
+2 -18
View File
@@ -697,7 +697,7 @@
<SkinSelected>Button</SkinSelected> <SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height--> <!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>300</X> <X>300</X>
<Y>210</Y> <Y>205</Y>
<Z>0,00</Z> <Z>0,00</Z>
<W>150</W> <W>150</W>
<H>50</H> <H>50</H>
@@ -735,17 +735,9 @@
<!--<Reflection> If exists:--> <!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
<Reflection>
<Space>10</Space>
<Height>26</Height>
</Reflection>
<!--<SReflection> If exists:--> <!--<SReflection> If exists:-->
<!-- <Space>: Reflection Space of selected button--> <!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button--> <!-- <Height>: Reflection Height of selected button-->
<SReflection>
<Space>10</Space>
<Height>26</Height>
</SReflection>
</ButtonSaveSnapshot> </ButtonSaveSnapshot>
<ButtonDiscardSnapshot> <ButtonDiscardSnapshot>
<!--<Skin>: Texture name--> <!--<Skin>: Texture name-->
@@ -754,7 +746,7 @@
<SkinSelected>Button</SkinSelected> <SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height--> <!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>300</X> <X>300</X>
<Y>110</Y> <Y>125</Y>
<Z>0,00</Z> <Z>0,00</Z>
<W>150</W> <W>150</W>
<H>50</H> <H>50</H>
@@ -792,17 +784,9 @@
<!--<Reflection> If exists:--> <!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
<Reflection>
<Space>10</Space>
<Height>26</Height>
</Reflection>
<!--<SReflection> If exists:--> <!--<SReflection> If exists:-->
<!-- <Space>: Reflection Space of selected button--> <!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button--> <!-- <Height>: Reflection Height of selected button-->
<SReflection>
<Space>10</Space>
<Height>26</Height>
</SReflection>
</ButtonDiscardSnapshot> </ButtonDiscardSnapshot>
<SelectSlideProfiles> <SelectSlideProfiles>
<!--<Skin>: Texture name--> <!--<Skin>: Texture name-->
Vocaluxe/Screens/CScreenProfiles.cs
+9
View File
@@ -206,6 +206,8 @@ namespace Vocaluxe.Screens
{ {
CProfiles.SetAvatar(SelectSlides[htSelectSlides(SelectSlideProfiles)].Selection, CProfiles.SetAvatar(SelectSlides[htSelectSlides(SelectSlideProfiles)].Selection,
SelectSlides[htSelectSlides(SelectSlideAvatars)].Selection); SelectSlides[htSelectSlides(SelectSlideAvatars)].Selection);
if (CWebcam.GetDevices().Length > 0 && _WebcamTexture.index > 0)
OnDiscardSnapshot();
} else if (SelectSlides[htSelectSlides(SelectSlideGuestProfile)].Selected) } else if (SelectSlides[htSelectSlides(SelectSlideGuestProfile)].Selected)
{ {
CProfiles.SetGuestProfile(SelectSlides[htSelectSlides(SelectSlideProfiles)].Selection, CProfiles.SetGuestProfile(SelectSlides[htSelectSlides(SelectSlideProfiles)].Selection,
@@ -339,6 +341,13 @@ namespace Vocaluxe.Screens
UpdateGame(); UpdateGame();
} }
public override void OnClose()
{
base.OnClose();
OnDiscardSnapshot();
}
public override bool Draw() public override bool Draw()
{ {
return base.Draw(); return base.Draw();