Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-04 20:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Linux fixes. Windows fix build.

Browse Source
This commit is contained in:
Martín Lucas Golini
2023-10-29 20:54:31 -03:00
parent 398a6341d0
commit 620c3ba98c
4 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/eepp/ui/uicodeeditor.cpp
View File

@@ -898,9 +898,6 @@ Uint32 UICodeEditor::onFocusLoss() {
}
Uint32 UICodeEditor::onTextInput( const TextInputEvent& event ) {
if ( getUISceneNode()->getWindow()->getIME().isEditing() )
return 0;
mLastActivity.restart();
if ( mLocked || NULL == mFont )

3
src/eepp/ui/uiconsole.cpp
View File

@@ -889,9 +889,6 @@ Uint32 UIConsole::onKeyDown( const KeyEvent& event ) {
}
Uint32 UIConsole::onTextInput( const TextInputEvent& event ) {
if ( getUISceneNode()->getWindow()->getIME().isEditing() )
return 0;
Input* input = getUISceneNode()->getWindow()->getInput();
if ( ( input->isLeftAltPressed() && !event.getText().empty() && event.getText()[0] == '\t' ) ||

3
src/eepp/ui/uitextinput.cpp
View File

@@ -784,9 +784,6 @@ Uint32 UITextInput::onKeyDown( const KeyEvent& event ) {
}
Uint32 UITextInput::onTextInput( const TextInputEvent& event ) {
if ( getUISceneNode()->getWindow()->getIME().isEditing() )
return 0;
if ( !mAllowEditing )
return 0;
Input* input = getUISceneNode()->getWindow()->getInput();

8
src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp
View File

@@ -1499,7 +1499,7 @@ void TerminalDisplay::onProcessExit( int exitCode ) {
}
void TerminalDisplay::onTextInput( const Uint32& chr ) {
if ( !mTerminal || mWindow->getIME().isEditing() )
if ( !mTerminal )
return;
String input;
input.push_back( chr );
@@ -1507,7 +1507,7 @@ void TerminalDisplay::onTextInput( const Uint32& chr ) {
mTerminal->ttywrite( utf8Input.c_str(), utf8Input.size(), 1 );
}
void TerminalDisplay::onTextEditing( const String& text, const Int32& start, const Int32& length ) {
void TerminalDisplay::onTextEditing( const String&, const Int32&, const Int32& ) {
if ( !mTerminal )
return;
invalidateCursor();
@@ -1752,8 +1752,8 @@ void TerminalDisplay::initVBOs() {
Rectf TerminalDisplay::updateIMELocation() {
if ( !Engine::isRunninMainThread() )
return {};
auto fontSize = mFont->getFontHeight( mFontSize );
auto spaceCharAdvanceX = mFont->getGlyph( 'A', mFontSize, false, false ).advance;
Float fontSize = mFont->getFontHeight( mFontSize );
Float spaceCharAdvanceX = mFont->getGlyph( 'A', mFontSize, false, false ).advance;
auto pos = mPosition.floor() + Vector2f( mPadding.Left, mPadding.Top );
Rectf r( { pos.x + mCursor.x * spaceCharAdvanceX, pos.y + mCursor.y * fontSize },
{ spaceCharAdvanceX, fontSize } );