Code-style consistency improvement:

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

View File

@@ -5,66 +5,65 @@ using namespace Gwen;
class Label : public GUnit
{
public:
GWEN_CONTROL_INLINE( Label, GUnit )
public:
GWEN_CONTROL_INLINE(Label, GUnit)
{
{
Gwen::Controls::Label* label = new Gwen::Controls::Label( this );
label->SetText( "Garry's Normal Label" );
Gwen::Controls::Label* label = new Gwen::Controls::Label(this);
label->SetText("Garry's Normal Label");
label->SizeToContents();
label->SetPos( 10, 10 );
label->SetPos(10, 10);
}
{
Gwen::Controls::Label* label = new Gwen::Controls::Label( this );
label->SetText( L"Chinese: \u4E45\u6709\u5F52\u5929\u613F \u7EC8\u8FC7\u9B3C\u95E8\u5173" );
Gwen::Controls::Label* label = new Gwen::Controls::Label(this);
label->SetText(L"Chinese: \u4E45\u6709\u5F52\u5929\u613F \u7EC8\u8FC7\u9B3C\u95E8\u5173");
label->SizeToContents();
label->SetPos( 10, 30 );
label->SetPos(10, 30);
}
{
Gwen::Controls::Label* label = new Gwen::Controls::Label( this );
label->SetText( L"Japanese: \u751F\u3080\u304E\u3000\u751F\u3054\u3081\u3000\u751F\u305F\u307E\u3054" );
Gwen::Controls::Label* label = new Gwen::Controls::Label(this);
label->SetText(L"Japanese: \u751F\u3080\u304E\u3000\u751F\u3054\u3081\u3000\u751F\u305F\u307E\u3054");
label->SizeToContents();
label->SetPos( 10, 50 );
label->SetPos(10, 50);
}
{
Gwen::Controls::Label* label = new Gwen::Controls::Label( this );
label->SetText( L"Korean: \uADF9\uC9C0\uD0D0\uD5D8\u3000\uD611\uD68C\uACB0\uC131\u3000\uCCB4\uACC4\uC801\u3000\uC5F0\uAD6C" );
Gwen::Controls::Label* label = new Gwen::Controls::Label(this);
label->SetText(L"Korean: \uADF9\uC9C0\uD0D0\uD5D8\u3000\uD611\uD68C\uACB0\uC131\u3000\uCCB4\uACC4\uC801\u3000\uC5F0\uAD6C");
label->SizeToContents();
label->SetPos( 10, 70 );
label->SetPos(10, 70);
}
{
Gwen::Controls::Label* label = new Gwen::Controls::Label( this );
label->SetText( L"Hindi: \u092F\u0947 \u0905\u0928\u0941\u091A\u094D\u091B\u0947\u0926 \u0939\u093F\u0928\u094D\u0926\u0940 \u092E\u0947\u0902 \u0939\u0948\u0964" );
Gwen::Controls::Label* label = new Gwen::Controls::Label(this);
label->SetText(L"Hindi: \u092F\u0947 \u0905\u0928\u0941\u091A\u094D\u091B\u0947\u0926 \u0939\u093F\u0928\u094D\u0926\u0940 \u092E\u0947\u0902 \u0939\u0948\u0964");
label->SizeToContents();
label->SetPos( 10, 90 );
label->SetPos(10, 90);
}
{
Gwen::Controls::Label* label = new Gwen::Controls::Label( this );
label->SetText( L"Arabic: \u0627\u0644\u0622\u0646 \u0644\u062D\u0636\u0648\u0631 \u0627\u0644\u0645\u0624\u062A\u0645\u0631 \u0627\u0644\u062F\u0648\u0644\u064A" );
Gwen::Controls::Label* label = new Gwen::Controls::Label(this);
label->SetText(L"Arabic: \u0627\u0644\u0622\u0646 \u0644\u062D\u0636\u0648\u0631 \u0627\u0644\u0645\u0624\u062A\u0645\u0631 \u0627\u0644\u062F\u0648\u0644\u064A");
label->SizeToContents();
label->SetPos( 10, 110 );
label->SetPos(10, 110);
}
{
Gwen::Controls::Label* label = new Gwen::Controls::Label( this );
label->SetText( L"Wow, Coloured Text" );
label->SetTextColor( Gwen::Color( 0, 0, 255, 255 ) );
Gwen::Controls::Label* label = new Gwen::Controls::Label(this);
label->SetText(L"Wow, Coloured Text");
label->SetTextColor(Gwen::Color(0, 0, 255, 255));
label->SizeToContents();
label->SetPos( 10, 130 );
label->SetPos(10, 130);
}
{
Gwen::Controls::Label* label = new Gwen::Controls::Label( this );
label->SetText( L"Coloured Text With Alpha" );
label->SetTextColor( Gwen::Color( 0, 0, 255, 100 ) );
Gwen::Controls::Label* label = new Gwen::Controls::Label(this);
label->SetText(L"Coloured Text With Alpha");
label->SetTextColor(Gwen::Color(0, 0, 255, 100));
label->SizeToContents();
label->SetPos( 10, 150 );
label->SetPos(10, 150);
}
{
@@ -75,25 +74,22 @@ class Label : public GUnit
m_Font.facename = L"Comic Sans MS";
m_Font.size = 25;
Gwen::Controls::Label* label = new Gwen::Controls::Label( this );
label->SetText( L"Custom Font (Comic Sans 25)" );
label->SetFont( &m_Font );
Gwen::Controls::Label* label = new Gwen::Controls::Label(this);
label->SetText(L"Custom Font (Comic Sans 25)");
label->SetFont(&m_Font);
label->SizeToContents();
label->SetPos( 10, 170 );
label->SetPos(10, 170);
}
{
Gwen::Controls::Label* label = new Gwen::Controls::Label( this );
label->SetText( L"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n\nLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." );
Gwen::Controls::Label* label = new Gwen::Controls::Label(this);
label->SetText(L"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n\nLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
label->SizeToContents();
label->SetBounds( 300, 10, 150, 500 );
label->SetBounds(300, 10, 150, 500);
}
}
Gwen::Font m_Font;
Gwen::Font m_Font;
};
DEFINE_UNIT_TEST( Label, L"Label" );
DEFINE_UNIT_TEST(Label, L"Label");