edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-18 05:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9054 from KebsCS/pr-rightclick-layer

Browse source 
Add right-click to solo editor layer
This commit is contained in:
Robert Müller 2024-09-28 18:04:10 +00:00 committed by GitHub
parent 27e29a1ba7 cc2ce6ea9b
commit c573427609
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 71 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/game/editor/editor.cpp
View file

@ -3894,8 +3894,43 @@ void CEditor::RenderLayers(CUIRect LayersBox)
if(s_ScrollRegion.AddRect(Slot))
{
Slot.VSplitLeft(15.0f, &VisibleToggle, &Slot);
if(DoButton_FontIcon(&m_Map.m_vpGroups[g]->m_Visible, m_Map.m_vpGroups[g]->m_Visible ? FONT_ICON_EYE : FONT_ICON_EYE_SLASH, m_Map.m_vpGroups[g]->m_Collapse ? 1 : 0, &VisibleToggle, 0, "Toggle group visibility", IGraphics::CORNER_L, 8.0f))
const int MouseClick = DoButton_FontIcon(&m_Map.m_vpGroups[g]->m_Visible, m_Map.m_vpGroups[g]->m_Visible ? FONT_ICON_EYE : FONT_ICON_EYE_SLASH, m_Map.m_vpGroups[g]->m_Collapse ? 1 : 0, &VisibleToggle, 0, "Left click to toggle visibility. Right click to show this group only.", IGraphics::CORNER_L, 8.0f);
if(MouseClick == 1)
{
m_Map.m_vpGroups[g]->m_Visible = !m_Map.m_vpGroups[g]->m_Visible;
}
else if(MouseClick == 2)
{
if(Input()->ShiftIsPressed())
{
if(g != m_SelectedGroup)
SelectLayer(0, g);
}
int NumActive = 0;
for(auto &Group : m_Map.m_vpGroups)
{
if(Group == m_Map.m_vpGroups[g])
{
Group->m_Visible = true;
continue;
}
if(Group->m_Visible)
{
Group->m_Visible = false;
NumActive++;
}
}
if(NumActive == 0)
{
for(auto &Group : m_Map.m_vpGroups)
{
Group->m_Visible = true;
}
}
}
str_format(aBuf, sizeof(aBuf), "#%d %s", g, m_Map.m_vpGroups[g]->m_aName);
@ -4019,8 +4054,42 @@ void CEditor::RenderLayers(CUIRect LayersBox)
Slot.VSplitLeft(12.0f, nullptr, &Slot);
Slot.VSplitLeft(15.0f, &VisibleToggle, &Button);
if(DoButton_FontIcon(&m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible, m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible ? FONT_ICON_EYE : FONT_ICON_EYE_SLASH, 0, &VisibleToggle, 0, "Toggle layer visibility", IGraphics::CORNER_L, 8.0f))
const int MouseClick = DoButton_FontIcon(&m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible, m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible ? FONT_ICON_EYE : FONT_ICON_EYE_SLASH, 0, &VisibleToggle, 0, "Left click to toggle visibility. Right click to show only this layer within its group.", IGraphics::CORNER_L, 8.0f);
if(MouseClick == 1)
{
m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible = !m_Map.m_vpGroups[g]->m_vpLayers[i]->m_Visible;
}
else if(MouseClick == 2)
{
if(Input()->ShiftIsPressed())
{
if(!IsLayerSelected)
SelectLayer(i, g);
}
int NumActive = 0;
for(auto &Layer : m_Map.m_vpGroups[g]->m_vpLayers)
{
if(Layer == m_Map.m_vpGroups[g]->m_vpLayers[i])
{
Layer->m_Visible = true;
continue;
}
if(Layer->m_Visible)
{
Layer->m_Visible = false;
NumActive++;
}
}
if(NumActive == 0)
{
for(auto &Layer : m_Map.m_vpGroups[g]->m_vpLayers)
{
Layer->m_Visible = true;
}
}
}
if(m_Map.m_vpGroups[g]->m_vpLayers[i]->m_aName[0])
str_copy(aBuf, m_Map.m_vpGroups[g]->m_vpLayers[i]->m_aName);