mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-19 09:12:19 +00:00
Merge pull request #8875 from ChillerDragon/pr_prompt_label_size
Grow prompt label if there is space and fix margins
This commit is contained in:
commit
7a60f4a5e7
|
@ -126,6 +126,8 @@ void CPrompt::OnRender(CUIRect _)
|
||||||
s_ListBox.SetActive(!Ui()->IsPopupOpen());
|
s_ListBox.SetActive(!Ui()->IsPopupOpen());
|
||||||
s_ListBox.DoStart(15.0f, m_vpFilteredPromptList.size(), 1, 5, m_PromptSelectedIndex, &Suggestions, false);
|
s_ListBox.DoStart(15.0f, m_vpFilteredPromptList.size(), 1, 5, m_PromptSelectedIndex, &Suggestions, false);
|
||||||
|
|
||||||
|
float LabelWidth = Overlay.w > 855.0f ? 200.0f : 100.0f;
|
||||||
|
|
||||||
for(size_t i = 0; i < m_vpFilteredPromptList.size(); i++)
|
for(size_t i = 0; i < m_vpFilteredPromptList.size(); i++)
|
||||||
{
|
{
|
||||||
const CListboxItem Item = s_ListBox.DoNextItem(m_vpFilteredPromptList[i], m_PromptSelectedIndex >= 0 && (size_t)m_PromptSelectedIndex == i);
|
const CListboxItem Item = s_ListBox.DoNextItem(m_vpFilteredPromptList[i], m_PromptSelectedIndex >= 0 && (size_t)m_PromptSelectedIndex == i);
|
||||||
|
@ -133,9 +135,10 @@ void CPrompt::OnRender(CUIRect _)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
CUIRect LabelColumn, DescColumn;
|
CUIRect LabelColumn, DescColumn;
|
||||||
Item.m_Rect.VSplitLeft(5.0f, nullptr, &LabelColumn);
|
float Margin = 5.0f;
|
||||||
LabelColumn.VSplitLeft(100.0f, &LabelColumn, &DescColumn);
|
Item.m_Rect.VSplitLeft(Margin, nullptr, &LabelColumn);
|
||||||
LabelColumn.VSplitRight(5.0f, &LabelColumn, nullptr);
|
LabelColumn.VSplitLeft(LabelWidth, &LabelColumn, &DescColumn);
|
||||||
|
DescColumn.VSplitRight(Margin, &DescColumn, nullptr);
|
||||||
|
|
||||||
SLabelProperties Props;
|
SLabelProperties Props;
|
||||||
Props.m_MaxWidth = LabelColumn.w;
|
Props.m_MaxWidth = LabelColumn.w;
|
||||||
|
|
Loading…
Reference in a new issue