Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code-style consistency improvement:

Browse Source 
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
examples/ThirdPartyLibs/Gwen/Controls/VerticalScrollBar.cpp
View File

@@ -4,56 +4,55 @@
See license in Gwen.h
*/
#include "Gwen/Controls/ScrollBar.h"
#include "Gwen/Controls/VerticalScrollBar.h"
using namespace Gwen;
using namespace Gwen::Controls;
GWEN_CONTROL_CONSTRUCTOR( VerticalScrollBar )
GWEN_CONTROL_CONSTRUCTOR(VerticalScrollBar)
{
m_Bar->SetVertical();
m_ScrollButton[SCROLL_BUTTON_UP]->SetDirectionUp();
m_ScrollButton[SCROLL_BUTTON_UP]->onPress.Add( this, &VerticalScrollBar::NudgeUp );
m_ScrollButton[SCROLL_BUTTON_UP]->onPress.Add(this, &VerticalScrollBar::NudgeUp);
m_ScrollButton[SCROLL_BUTTON_DOWN]->SetDirectionDown();
m_ScrollButton[SCROLL_BUTTON_DOWN]->onPress.Add( this, &VerticalScrollBar::NudgeDown );
m_ScrollButton[SCROLL_BUTTON_DOWN]->onPress.Add(this, &VerticalScrollBar::NudgeDown);
m_Bar->onDragged.Add( this, &VerticalScrollBar::OnBarMoved );
m_Bar->onDragged.Add(this, &VerticalScrollBar::OnBarMoved);
}
void VerticalScrollBar::Layout( Skin::Base* skin )
void VerticalScrollBar::Layout(Skin::Base* skin)
{
BaseClass::Layout( skin );
BaseClass::Layout(skin);
m_ScrollButton[SCROLL_BUTTON_UP]->Dock(Pos::Top);
m_ScrollButton[SCROLL_BUTTON_UP]->SetHeight( Width() );
m_ScrollButton[SCROLL_BUTTON_UP]->SetHeight(Width());
m_ScrollButton[SCROLL_BUTTON_DOWN]->Dock(Pos::Bottom);
m_ScrollButton[SCROLL_BUTTON_DOWN]->SetHeight( Width() );
m_ScrollButton[SCROLL_BUTTON_DOWN]->SetHeight(Width());
m_Bar->SetWidth( GetButtonSize() );
m_Bar->SetWidth(GetButtonSize());
//Add padding
m_Bar->SetPadding( Padding(0, GetButtonSize(), 0, GetButtonSize() ) );
m_Bar->SetPadding(Padding(0, GetButtonSize(), 0, GetButtonSize()));
//Calculate bar sizes
float barHeight = (m_fViewableContentSize / m_fContentSize) * (Height() - (GetButtonSize() * 2));
if ( barHeight < GetButtonSize() * 0.5 )
if (barHeight < GetButtonSize() * 0.5)
barHeight = GetButtonSize() * 0.5;
m_Bar->SetHeight(barHeight);
m_Bar->SetHidden( Height() - (GetButtonSize() * 2) <= barHeight );
m_Bar->SetHidden(Height() - (GetButtonSize() * 2) <= barHeight);
if ( Hidden() )
if (Hidden())
SetScrolledAmount(0, true);
//Based on our last scroll amount, produce a position for the bar
if ( !m_Bar->IsDepressed() )
if (!m_Bar->IsDepressed())
{
SetScrolledAmount( GetScrolledAmount(), true );
SetScrolledAmount(GetScrolledAmount(), true);
}
}
@@ -65,40 +64,40 @@ void VerticalScrollBar::ScrollToBottom()
{
SetScrolledAmount(1, true);
}
void VerticalScrollBar::NudgeUp( Base* /*control*/ )
void VerticalScrollBar::NudgeUp(Base* /*control*/)
{
if ( !IsDisabled() )
if (!IsDisabled())
SetScrolledAmount(GetScrolledAmount() - GetNudgeAmount(), true);
}
void VerticalScrollBar::NudgeDown( Base* /*control*/ )
void VerticalScrollBar::NudgeDown(Base* /*control*/)
{
if ( !IsDisabled() )
if (!IsDisabled())
SetScrolledAmount(GetScrolledAmount() + GetNudgeAmount(), true);
}
float VerticalScrollBar::GetNudgeAmount()
{
if ( m_bDepressed )
if (m_bDepressed)
return m_fViewableContentSize / m_fContentSize;
else
else
return BaseClass::GetNudgeAmount();
}
void VerticalScrollBar::OnMouseClickLeft( int x, int y, bool bDown )
void VerticalScrollBar::OnMouseClickLeft(int x, int y, bool bDown)
{
if ( bDown )
if (bDown)
{
m_bDepressed = true;
Gwen::MouseFocus = this;
}
else
{
Gwen::Point clickPos = CanvasPosToLocal( Gwen::Point( x, y ) );
if ( clickPos.y < m_Bar->Y() )
NudgeUp( this );
else if ( clickPos.y > m_Bar->Y() + m_Bar->Height() )
NudgeDown( this );
Gwen::Point clickPos = CanvasPosToLocal(Gwen::Point(x, y));
if (clickPos.y < m_Bar->Y())
NudgeUp(this);
else if (clickPos.y > m_Bar->Y() + m_Bar->Height())
NudgeDown(this);
m_bDepressed = false;
Gwen::MouseFocus = NULL;
@@ -107,30 +106,30 @@ void VerticalScrollBar::OnMouseClickLeft( int x, int y, bool bDown )
float VerticalScrollBar::CalculateScrolledAmount()
{
return (float)(m_Bar->Y() - GetButtonSize()) / (float)(Height() - m_Bar->Height() - (GetButtonSize() * 2 ));
return (float)(m_Bar->Y() - GetButtonSize()) / (float)(Height() - m_Bar->Height() - (GetButtonSize() * 2));
}
bool VerticalScrollBar::SetScrolledAmount(float amount, bool forceUpdate)
{
amount = Gwen::Clamp( amount, 0, 1 );
amount = Gwen::Clamp(amount, 0, 1);
if ( !BaseClass::SetScrolledAmount( amount, forceUpdate ) )
if (!BaseClass::SetScrolledAmount(amount, forceUpdate))
return false;
if ( forceUpdate )
if (forceUpdate)
{
int newY = GetButtonSize() + (amount * ((Height() - m_Bar->Height()) - (GetButtonSize()*2)));
m_Bar->MoveTo( m_Bar->X(), newY);
int newY = GetButtonSize() + (amount * ((Height() - m_Bar->Height()) - (GetButtonSize() * 2)));
m_Bar->MoveTo(m_Bar->X(), newY);
}
return true;
}
void VerticalScrollBar::OnBarMoved( Controls::Base* control )
void VerticalScrollBar::OnBarMoved(Controls::Base* control)
{
if ( m_Bar->IsDepressed() )
if (m_Bar->IsDepressed())
{
SetScrolledAmount( CalculateScrolledAmount(), false );
SetScrolledAmount(CalculateScrolledAmount(), false);
BaseClass::OnBarMoved(control);
}
else