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

43
examples/ThirdPartyLibs/Gwen/Controls/ScrollBar.cpp
View File

@@ -4,7 +4,6 @@
See license in Gwen.h
*/
#include "Gwen/Controls/ScrollBar.h"
#include "Gwen/Controls/ScrollBarButton.h"
#include "Gwen/Controls/ScrollBarBar.h"
@@ -13,71 +12,63 @@ using namespace Gwen;
using namespace Gwen::Controls;
using namespace Gwen::ControlsInternal;
GWEN_CONTROL_CONSTRUCTOR( BaseScrollBar )
GWEN_CONTROL_CONSTRUCTOR(BaseScrollBar)
{
for (int i = 0; i < 2; i++)
{
m_ScrollButton[i] = new ScrollBarButton( this );
m_ScrollButton[i] = new ScrollBarButton(this);
}
m_Bar = new ScrollBarBar( this );
SetBounds( 0, 0, 15, 15 );
m_Bar = new ScrollBarBar(this);
SetBounds(0, 0, 15, 15);
m_bDepressed = false;
m_fScrolledAmount = 0;
m_fContentSize = 0;
m_fViewableContentSize = 0;
SetNudgeAmount( 20 );
SetNudgeAmount(20);
}
void BaseScrollBar::Render( Skin::Base* skin )
void BaseScrollBar::Render(Skin::Base* skin)
{
skin->DrawScrollBar( this, false, m_bDepressed );
skin->DrawScrollBar(this, false, m_bDepressed);
}
void BaseScrollBar::OnBarMoved( Controls::Base* /*control*/ )
void BaseScrollBar::OnBarMoved(Controls::Base* /*control*/)
{
onBarMoved.Call( this );
onBarMoved.Call(this);
}
void BaseScrollBar::BarMovedNotification()
{
OnBarMoved( this );
OnBarMoved(this);
}
void BaseScrollBar::SetContentSize( float size )
void BaseScrollBar::SetContentSize(float size)
{
if ( m_fContentSize != size )
if (m_fContentSize != size)
{
Invalidate();
}
m_fContentSize = size;
}
void BaseScrollBar::SetViewableContentSize( float size )
void BaseScrollBar::SetViewableContentSize(float size)
{
if ( m_fViewableContentSize != size )
if (m_fViewableContentSize != size)
Invalidate();
m_fViewableContentSize = size;
}
bool BaseScrollBar::SetScrolledAmount( float amount, bool /*forceUpdate*/ )
bool BaseScrollBar::SetScrolledAmount(float amount, bool /*forceUpdate*/)
{
if ( m_fScrolledAmount == amount ) return false;
if (m_fScrolledAmount == amount) return false;
m_fScrolledAmount = amount;
Invalidate();
BarMovedNotification();
return true;
}