Song search field improvement (#848)
* StaticSearchBar Visible * Update TextSearchBarTitle * Update TextSearchBarTitle * Update TR_SCREENSONG_SEARCH * Update TextSearchBarTitle * Update TextSearchBarTitle * Update SearchBar * Update SearchBar * Update SearchBar * Update SearchBar * Update SearchBar * Update SearchBar * Update SearchBar * Update SearchBar * Update SearchBar * Update SearchBar * Update SearchBar
This commit is contained in:
1 parent
e249baf2d4
commit
53023616a3
3 files changed
+28
-11
No files matched your search
@@ -155,7 +155,7 @@
|
|||||||
<string name="TR_SCREENSONG_PLAYERSELECT">Player selection</string>
|
<string name="TR_SCREENSONG_PLAYERSELECT">Player selection</string>
|
||||||
<string name="TR_SCREENSONG_PLAYERSELECT_ON">Show player selection</string>
|
<string name="TR_SCREENSONG_PLAYERSELECT_ON">Show player selection</string>
|
||||||
<string name="TR_SCREENSONG_PLAYERSELECT_OFF">Skip player selection</string>
|
<string name="TR_SCREENSONG_PLAYERSELECT_OFF">Skip player selection</string>
|
||||||
<string name="TR_SCREENSONG_SEARCH">Search:</string>
|
<string name="TR_SCREENSONG_SEARCH">Search song</string>
|
||||||
<string name="TR_SCREENSONG_NOLANGUAGE">No language</string>
|
<string name="TR_SCREENSONG_NOLANGUAGE">No language</string>
|
||||||
<string name="TR_SCREENSONG_NOYEAR">No Year</string>
|
<string name="TR_SCREENSONG_NOYEAR">No Year</string>
|
||||||
<string name="TR_SCREENSONG_NOGENRE">No Genre</string>
|
<string name="TR_SCREENSONG_NOGENRE">No Genre</string>
|
||||||
|
|||||||
@@ -218,14 +218,14 @@
|
|||||||
</Reflection>
|
</Reflection>
|
||||||
</Text>
|
</Text>
|
||||||
<Text Name="TextSearchBarTitle">
|
<Text Name="TextSearchBarTitle">
|
||||||
<X>150</X>
|
<X>355</X>
|
||||||
<Y>918</Y>
|
<Y>923</Y>
|
||||||
<Z>0</Z>
|
<Z>0</Z>
|
||||||
<H>40.5</H>
|
<H>30.5</H>
|
||||||
<MaxW>0</MaxW>
|
<MaxW>0</MaxW>
|
||||||
<Color Name="Invisible" />
|
<Color Name="ButtonTextColor" />
|
||||||
<SelColor Name="TextSelColor" />
|
<SelColor Name="ButtonTextSelColor" />
|
||||||
<Align>Right</Align>
|
<Align>Center</Align>
|
||||||
<ResizeAlign>Center</ResizeAlign>
|
<ResizeAlign>Center</ResizeAlign>
|
||||||
<Style>Bold</Style>
|
<Style>Bold</Style>
|
||||||
<Font>Outline</Font>
|
<Font>Outline</Font>
|
||||||
|
|||||||
@@ -517,6 +517,24 @@ namespace Vocaluxe.Screens
|
|||||||
{
|
{
|
||||||
base.HandleMouse(mouseEvent);
|
base.HandleMouse(mouseEvent);
|
||||||
|
|
||||||
|
bool overSearchBar = _Statics[_StaticSearchBar].Visible && CHelper.IsInBounds(_Statics[_StaticSearchBar].Rect, mouseEvent) && !_Sso.Selection.PartyMode;
|
||||||
|
_Texts[_TextSearchBarTitle].Selected = overSearchBar;
|
||||||
|
|
||||||
|
if (mouseEvent.LB && overSearchBar)
|
||||||
|
{
|
||||||
|
if (_SearchActive)
|
||||||
|
{
|
||||||
|
_SearchActive = false;
|
||||||
|
_SearchText = String.Empty;
|
||||||
|
_ApplyNewSearchFilter(_SearchText);
|
||||||
|
}
|
||||||
|
else if (!_Sso.Selection.PartyMode)
|
||||||
|
{
|
||||||
|
_SearchActive = true;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
if (_DragAndDropCover.Visible)
|
if (_DragAndDropCover.Visible)
|
||||||
{
|
{
|
||||||
_DragAndDropCover.X += mouseEvent.X - _OldMousePosX;
|
_DragAndDropCover.X += mouseEvent.X - _OldMousePosX;
|
||||||
@@ -849,20 +867,18 @@ namespace Vocaluxe.Screens
|
|||||||
_Texts[_TextSearchBar].Text += '|';
|
_Texts[_TextSearchBar].Text += '|';
|
||||||
|
|
||||||
_Texts[_TextSearchBar].Visible = true;
|
_Texts[_TextSearchBar].Visible = true;
|
||||||
_Texts[_TextSearchBarTitle].Visible = true;
|
_Texts[_TextSearchBarTitle].Visible = false;
|
||||||
_Texts[_TextHelpBar].Visible = false;
|
_Texts[_TextHelpBar].Visible = false;
|
||||||
_Texts[_TextHelpBarSearch].Visible = true;
|
_Texts[_TextHelpBarSearch].Visible = true;
|
||||||
_Texts[_TextHelpBarParty].Visible = false;
|
_Texts[_TextHelpBarParty].Visible = false;
|
||||||
_Statics[_StaticSearchBar].Visible = true;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_Texts[_TextSearchBar].Visible = false;
|
_Texts[_TextSearchBar].Visible = false;
|
||||||
_Texts[_TextSearchBarTitle].Visible = false;
|
_Texts[_TextSearchBarTitle].Visible = !_Sso.Selection.PartyMode;
|
||||||
_Texts[_TextHelpBar].Visible = !_Sso.Selection.PartyMode;
|
_Texts[_TextHelpBar].Visible = !_Sso.Selection.PartyMode;
|
||||||
_Texts[_TextHelpBarSearch].Visible = false;
|
_Texts[_TextHelpBarSearch].Visible = false;
|
||||||
_Texts[_TextHelpBarParty].Visible = _Sso.Selection.PartyMode;
|
_Texts[_TextHelpBarParty].Visible = _Sso.Selection.PartyMode;
|
||||||
_Statics[_StaticSearchBar].Visible = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_UpdatePartyModeOptions();
|
_UpdatePartyModeOptions();
|
||||||
@@ -1423,6 +1439,7 @@ namespace Vocaluxe.Screens
|
|||||||
_Texts[_TextOptionsPlayerSelect].Visible = false;
|
_Texts[_TextOptionsPlayerSelect].Visible = false;
|
||||||
_Texts[_TextOptionsPlaylist].Visible = false;
|
_Texts[_TextOptionsPlaylist].Visible = false;
|
||||||
_Statics[_StaticOptionsBG].Visible = false;
|
_Statics[_StaticOptionsBG].Visible = false;
|
||||||
|
_Statics[_StaticSearchBar].Visible = !_Sso.Selection.PartyMode;
|
||||||
_Buttons[_ButtonOpenOptions].Visible = true;
|
_Buttons[_ButtonOpenOptions].Visible = true;
|
||||||
|
|
||||||
if (view == ESongOptionsView.None)
|
if (view == ESongOptionsView.None)
|
||||||
|
|||||||
Reference in new issue
Block a user