Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-28 17:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Build fixes.

Browse Source
This commit is contained in:
Martín Lucas Golini
2022-07-04 01:15:12 -03:00
parent 85e1c1e5a3
commit c06eaa8d78
5 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/eepp/ui/uispinbox.hpp
View File

@@ -57,7 +57,7 @@ class EE_API UISpinBox : public UIWidget {
virtual bool applyProperty( const StyleSheetProperty& attribute );
virtual std::string getPropertyString( const PropertyDefinition* propertyDef,
const Uint32& propertyIndex = 0 );
const Uint32& propertyIndex = 0 ) const;
protected:
UITextInput* mInput;

2
include/eepp/ui/uitextinputpassword.hpp
View File

@@ -15,7 +15,7 @@ class EE_API UITextInputPassword : public UITextInput {
virtual void draw();
virtual const String& getText();
virtual const String& getText() const;
virtual UITextView* setText( const String& text );

2
src/eepp/ui/uispinbox.cpp
View File

@@ -283,7 +283,7 @@ void UISpinBox::onPaddingChange() {
}
std::string UISpinBox::getPropertyString( const PropertyDefinition* propertyDef,
const Uint32& propertyIndex ) {
const Uint32& propertyIndex ) const {
if ( NULL == propertyDef )
return "";

26
src/eepp/ui/uitextinputpassword.cpp
View File

@@ -14,8 +14,6 @@ UITextInputPassword::UITextInputPassword() :
mPassCache = Text::New();
updateFontStyleConfig();
alignFix();
}
UITextInputPassword::~UITextInputPassword() {
@@ -67,8 +65,8 @@ void UITextInputPassword::draw() {
void UITextInputPassword::alignFix() {
switch ( Font::getHorizontalAlign( getFlags() ) ) {
case UI_HALIGN_CENTER:
mRealAlignOffset.x = ( Float )( ( Int32 )( mSize.x - mPassCache->getTextWidth() ) / 2 );
mHintAlignOffset.x = ( Float )( ( Int32 )( mSize.x - mHintCache->getTextWidth() ) / 2 );
mRealAlignOffset.x = (Float)( (Int32)( mSize.x - mPassCache->getTextWidth() ) / 2 );
mHintAlignOffset.x = (Float)( (Int32)( mSize.x - mHintCache->getTextWidth() ) / 2 );
break;
case UI_HALIGN_RIGHT:
mRealAlignOffset.x = ( (Float)mSize.x - (Float)mPassCache->getTextWidth() );
@@ -82,16 +80,14 @@ void UITextInputPassword::alignFix() {
switch ( Font::getVerticalAlign( getFlags() ) ) {
case UI_VALIGN_CENTER:
mRealAlignOffset.y =
( Float )( ( ( Int32 )( mSize.y - mPaddingPx.Top - mPaddingPx.Bottom -
mPassCache->getTextHeight() ) ) /
2.f ) -
1;
mHintAlignOffset.y =
( Float )( ( ( Int32 )( mSize.y - mPaddingPx.Top - mPaddingPx.Bottom -
mHintCache->getTextHeight() ) ) /
2.f ) -
1;
mRealAlignOffset.y = (Float)( ( (Int32)( mSize.y - mPaddingPx.Top - mPaddingPx.Bottom -
mPassCache->getTextHeight() ) ) /
2.f ) -
1;
mHintAlignOffset.y = (Float)( ( (Int32)( mSize.y - mPaddingPx.Top - mPaddingPx.Bottom -
mHintCache->getTextHeight() ) ) /
2.f ) -
1;
break;
case UI_VALIGN_BOTTOM:
mRealAlignOffset.y = ( (Float)mSize.y - (Float)mPassCache->getTextHeight() );
@@ -172,7 +168,7 @@ void UITextInputPassword::onFontChanged() {
UITextInput::onFontChanged();
}
const String& UITextInputPassword::getText() {
const String& UITextInputPassword::getText() const {
return UITextView::getText();
}

1
src/tools/eterm/eterm.cpp
View File

@@ -101,7 +101,6 @@ EE_MAIN_FUNC int main( int, char*[] ) {
if ( String::contains( resPath, "ecode.app" ) ) {
resPath = FileSystem::getCurrentWorkingDirectory();
FileSystem::dirAddSlashAtEnd( resPath );
mIsBundledApp = true;
}
#elif EE_PLATFORM == EE_PLATFORM_LINUX
if ( String::contains( resPath, ".mount_" ) ) {