Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest upstream for ctrl support on macos #10

Merged
merged 4 commits into from
Oct 10, 2024
Merged

Update to latest upstream for ctrl support on macos #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d0bcc2
Fix crash in Qt6
vadi2 Apr 27, 2024
adbc544
Fix: revise QT version for changes to recursive mutexes
SlySven Jul 9, 2023
5e787cf
Fix: add ctrl-a / ctrl-e support for macOS
rparet Oct 8, 2024
f92ddf5
update changelog
gamecreature Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

edbee.lib:

- PR #147, Add ctrl-a / ctrl-e support for macOS
- fix, Autocomplete Improvements
- autocomplete is now really canceled with the escape key. It only appears again if the word becomes blank
- add Qt::NoFocus focus policy to TextEditorAutocompleteComponent, to hopefully solve focus issue (https://github.com/Mudlet/Mudlet/issues/5310)
Expand Down
2 changes: 2 additions & 0 deletions edbee-lib/edbee/data/factorykeymap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ void FactoryKeyMap::fill( TextEditorKeyMap* km )
add( "goto_next_word", "move_to_next_word" );
add( "goto_prev_word", "move_to_previous_word" );
add( "goto_bol", "move_to_start_of_line" );
add( "goto_bol", "move_to_start_of_block");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what effect this and the change two lines down do - but is it correct for the two new entries to have the same keys as the adjacent ones - or is it that what ever a block is this is treating it the same as a line? 😟

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you missed #9, have a look there for the information.

add( "goto_eol", "move_to_end_of_line" );
add( "goto_eol", "move_to_end_of_block");
add( "goto_next_line", "move_to_next_line" );
add( "goto_prev_line", "move_to_previous_line" );
add( "goto_bof", "move_to_start_of_document" );
Expand Down
4 changes: 2 additions & 2 deletions edbee-lib/edbee/util/mem/debug_allocs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ DebugAllocationList::DebugAllocationList()
, running_(false)
, started_(false)
{
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
mutex_ = new EdbeeRecursiveMutex( QMutex::Recursive );
#else
mutex_ = new EdbeeRecursiveMutex();
Expand Down Expand Up @@ -65,7 +65,7 @@ void DebugAllocationList::clear()
}


/// Retuns the mutex for thread-safety
/// Returns the mutex for thread-safety
EdbeeRecursiveMutex* DebugAllocationList::mutex()
{
return mutex_;
Expand Down
2 changes: 1 addition & 1 deletion edbee-lib/edbee/util/mem/debug_allocs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@



#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
#define EdbeeRecursiveMutex QMutex
#else
#define EdbeeRecursiveMutex QRecursiveMutex
Expand Down
2 changes: 0 additions & 2 deletions edbee-lib/edbee/views/components/texteditorautocompletecomponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ TextEditorAutoCompleteComponent::TextEditorAutoCompleteComponent(TextEditorContr

listWidgetRef_->setFocus();

hide();

infoTipRef_ = new FakeToolTip(controllerRef_, this);

QPalette p = listWidgetRef_->palette();
Expand Down