Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-27 08:37:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/a11y

Browse Source
This commit is contained in:
Martín Lucas Golini
2026-10-11 14:08:11 -03:00
parent f380cd7630 48b0ce6db6
commit 218c634bf2
8 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eepp/ui/doc/textdocument.cpp
+4 -4
View File
@@ -423,11 +423,11 @@ void TextDocument::resetSelection() {
String shiftJISToUTF32( const std::string_view& shiftJISString ) {
String string;
auto* ret = Window::Engine::instance()->getPlatformHelper()->iconv(
auto* ret = EE::Window::Engine::instance()->getPlatformHelper()->iconv(
"UTF-32LE", "SHIFT-JIS", shiftJISString.data(), shiftJISString.size() );
if ( ret ) {
string = String( reinterpret_cast<String::StringBaseType*>( ret ) );
Window::Engine::instance()->getPlatformHelper()->iconvFree( ret );
EE::Window::Engine::instance()->getPlatformHelper()->iconvFree( ret );
}
return string;
}
@@ -1138,12 +1138,12 @@ bool TextDocument::save( IOStream& stream, bool keepUndoRedoStatus ) {
break;
}
case TextFormat::Encoding::Shift_JIS: {
auto* ret = Window::Engine::instance()->getPlatformHelper()->iconv(
auto* ret = EE::Window::Engine::instance()->getPlatformHelper()->iconv(
"SHIFT-JIS", "UTF-8", text.c_str(), text.size() );
auto len = strlen( ret );
stream.write( ret, len );
MD5::update( md5Ctx, ret, len );
Window::Engine::instance()->getPlatformHelper()->iconvFree( ret );
EE::Window::Engine::instance()->getPlatformHelper()->iconvFree( ret );
break;
}
case TextFormat::Encoding::UTF8: {
src/eepp/ui/tools/uidiffview.cpp
+6 -6
View File
@@ -1851,17 +1851,17 @@ Uint32 UIDiffView::onKeyDown( const KeyEvent& event ) {
};
if ( !event.getSanitizedMod() ) {
if ( event.getKeyCode() == Window::KEY_PAGEDOWN ) {
if ( event.getKeyCode() == KEY_PAGEDOWN ) {
moveLinesOffset( editor->getViewPortLineCount().y );
} else if ( event.getKeyCode() == Window::KEY_PAGEUP ) {
} else if ( event.getKeyCode() == KEY_PAGEUP ) {
moveLinesOffset( -editor->getViewPortLineCount().y );
} else if ( event.getKeyCode() == Window::KEY_DOWN ) {
} else if ( event.getKeyCode() == KEY_DOWN ) {
moveLinesOffset( 1 );
} else if ( event.getKeyCode() == Window::KEY_UP ) {
} else if ( event.getKeyCode() == KEY_UP ) {
moveLinesOffset( -1 );
} else if ( event.getKeyCode() == Window::KEY_HOME ) {
} else if ( event.getKeyCode() == KEY_HOME ) {
editor->scrollToVisibleIndex( 0, false, true );
} else if ( event.getKeyCode() == Window::KEY_END ) {
} else if ( event.getKeyCode() == KEY_END ) {
editor->scrollToVisibleIndex( (Int64)editor->getTotalVisibleLines(), false, true );
}
}
src/eepp/ui/tools/uiinspectorserver.cpp
+1 -1
View File
@@ -681,7 +681,7 @@ struct UIInspectorServer::Impl {
json scenes = json::array();
std::map<std::string, json> newWindows;
std::map<std::string, json> newScenes;
Window::Engine::instance()->forEachWindow( [&]( Window::Window* window ) {
EE::Window::Engine::instance()->forEachWindow( [&]( EE::Window::Window* window ) {
auto size = window->getSize();
auto pos = window->getPosition();
json entry = { { "handle", inspector.windowHandle( window ) },
src/eepp/ui/uieventdispatcher.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ void UIEventDispatcher::checkTabPress( Uint32 KeyCode, Uint32 mod ) {
eeASSERT( NULL != mFocusNode );
if ( KeyCode == KEY_TAB ) {
mod = Input::sanitizeMod( mod );
Window::Window* win = mFocusNode->getSceneNode()->getWindow();
EE::Window::Window* win = mFocusNode->getSceneNode()->getWindow();
if ( mFocusNode->isWidget() && NULL != win && !mJustGainedFocus ) {
Uint32 tabMod = 0;
if ( ( mFocusNode->asType<UIWidget>()->getFlags() & UI_USES_TAB_MOD ) != 0 ) {
src/eepp/ui/uihtmlimage.cpp
+1 -1
View File
@@ -489,7 +489,7 @@ void UIHTMLImage::onDrawableResourceChange() {
bool UIHTMLImage::loadFileDrawable( const Network::URI& uri ) {
UISceneNode* scene = getUISceneNode();
if ( !scene || !scene->getThreadPool() ||
!Window::Engine::instance()->isSharedGLContextEnabled() )
!EE::Window::Engine::instance()->isSharedGLContextEnabled() )
return false;
Uint64 loadId = ++mRemoteImageLoadId;
std::string filePath = uri.getFSPath();
src/eepp/ui/uiimage.cpp
+1 -1
View File
@@ -320,7 +320,7 @@ void UIImage::onDrawableResourceChange() {
bool UIImage::loadFileDrawable( const Network::URI& uri ) {
UISceneNode* scene = getUISceneNode();
if ( !scene || !scene->getThreadPool() ||
!Window::Engine::instance()->isSharedGLContextEnabled() )
!EE::Window::Engine::instance()->isSharedGLContextEnabled() )
return false;
Uint64 loadId = ++mRemoteImageLoadId;
src/eepp/ui/uipushbutton.cpp
+1 -1
View File
@@ -499,7 +499,7 @@ void UIPushButton::onAlignChange() {
}
Uint32 UIPushButton::onKeyDown( const KeyEvent& event ) {
if ( event.getKeyCode() == KEY_RETURN || event.getKeyCode() == Window::KEY_KP_ENTER ) {
if ( event.getKeyCode() == KEY_RETURN || event.getKeyCode() == KEY_KP_ENTER ) {
NodeMessage Msg( this, NodeMessage::MouseClick, EE_BUTTON_LMASK );
messagePost( &Msg );
onMouseClick( Vector2i( 0, 0 ), EE_BUTTON_LMASK );
src/eepp/ui/uiscrollview.cpp
+7 -8
View File
@@ -536,8 +536,7 @@ void UIScrollView::setAnchorScroll( bool anchor ) {
Uint32 UIScrollView::onKeyDown( const KeyEvent& event ) {
const auto mod = event.getSanitizedMod();
if ( mDefaultKeybindings && event.getKeyCode() == Window::KEY_SPACE &&
( mod & ~KEYMOD_SHIFT ) == 0 ) {
if ( mDefaultKeybindings && event.getKeyCode() == KEY_SPACE && ( mod & ~KEYMOD_SHIFT ) == 0 ) {
// Active text input gets priority through onTextInput's normal bubbling path.
if ( getUISceneNode()->getWindow()->isTextInputActive() )
return UITouchDraggableWidget::onKeyDown( event );
@@ -547,22 +546,22 @@ Uint32 UIScrollView::onKeyDown( const KeyEvent& event ) {
if ( !mDefaultKeybindings || mod )
return UITouchDraggableWidget::onKeyDown( event );
if ( event.getKeyCode() == Window::KEY_UP ) {
if ( event.getKeyCode() == KEY_UP ) {
mVScroll->setValue( mVScroll->getValue() - mVScroll->getClickStep() );
return 1;
} else if ( event.getKeyCode() == Window::KEY_DOWN ) {
} else if ( event.getKeyCode() == KEY_DOWN ) {
mVScroll->setValue( mVScroll->getValue() + mVScroll->getClickStep() );
return 1;
} else if ( event.getKeyCode() == Window::KEY_PAGEDOWN ) {
} else if ( event.getKeyCode() == KEY_PAGEDOWN ) {
scrollByViewport( 1.f );
return 1;
} else if ( event.getKeyCode() == Window::KEY_PAGEUP ) {
} else if ( event.getKeyCode() == KEY_PAGEUP ) {
scrollByViewport( -1.f );
return 1;
} else if ( event.getKeyCode() == Window::KEY_HOME ) {
} else if ( event.getKeyCode() == KEY_HOME ) {
mVScroll->setValue( mVScroll->getMinValue() );
return 1;
} else if ( event.getKeyCode() == Window::KEY_END ) {
} else if ( event.getKeyCode() == KEY_END ) {
mVScroll->setValue( mVScroll->getMaxValue() );
return 1;
}