Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Scroll to the top when switching between tabs in the credits. Patch by vladislavbelov

Browse Source 
This was SVN commit r19036.
This commit is contained in:
wraitii 2016-12-11 21:15:50 +00:00
parent 818bd07bc7
commit 507ecff2ed
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
binaries/data/mods/mod/gui/gui.rnc
View File

@ -71,6 +71,7 @@ ex_settings =
attribute scrollbar { bool }?&
attribute scrollbar_style { text }?&
attribute scroll_bottom { bool }?&
attribute scroll_top { bool }?&
attribute selected_column { text }?&
attribute selected_column_order { text }?&
attribute sortable { bool }?&

5
binaries/data/mods/mod/gui/gui.rng
View File

@ -289,6 +289,11 @@
<ref name="bool"/>
</attribute>
</optional>
<optional>
<attribute name="scroll_top">
<ref name="bool"/>
</attribute>
</optional>
<optional>
<attribute name="selected_column"/>
</optional>

2
binaries/data/mods/public/gui/credits/credits.xml
View File

@ -28,7 +28,7 @@
</object>
<object type="image" sprite="ModernFade" size="220 30 100%-20 100%-54">
<object name="creditsText" type="text" style="textPanel"/>
<object name="creditsText" type="text" style="textPanel" scroll_top="true" />
</object>
<!-- Close dialog -->

10
source/gui/CText.cpp
View File

@ -34,6 +34,7 @@ CText::CText()
AddSetting(GUIST_bool, "scrollbar");
AddSetting(GUIST_CStr, "scrollbar_style");
AddSetting(GUIST_bool, "scroll_bottom");
AddSetting(GUIST_bool, "scroll_top");
AddSetting(GUIST_CGUISpriteInstance, "sprite");
AddSetting(GUIST_EAlign, "text_align");
AddSetting(GUIST_EVAlign, "text_valign");
@ -97,15 +98,16 @@ void CText::SetupText()
// Setup scrollbar
if (scrollbar)
{
bool scrollbottom = false;
GUI<bool>::GetSetting(this, "scroll_bottom", scrollbottom);
bool scroll_top = false, scroll_bottom = false;
GUI<bool>::GetSetting(this, "scroll_bottom", scroll_bottom);
GUI<bool>::GetSetting(this, "scroll_top", scroll_top);
// If we are currently scrolled to the bottom of the text,
// then add more lines of text, update the scrollbar so we
// stick to the bottom.
// (Use 1.5px delta so this triggers the first time caption is set)
bool bottom = false;
if (scrollbottom && GetScrollBar(0).GetPos() > GetScrollBar(0).GetMaxPos() - 1.5f)
if (scroll_bottom && GetScrollBar(0).GetPos() > GetScrollBar(0).GetMaxPos() - 1.5f)
bottom = true;
GetScrollBar(0).SetScrollRange(m_GeneratedTexts[0]->m_Size.cy);
@ -118,6 +120,8 @@ void CText::SetupText()
if (bottom)
GetScrollBar(0).SetPos(GetScrollBar(0).GetMaxPos());
if (scroll_top)
GetScrollBar(0).SetPos(0.0f);
}
}