Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
Kate
Commits
1532bffd
Commit
1532bffd
authored
Feb 22, 2021
by
Kåre Särs
Browse files
Enable Copy and SelectAll key-sequences in popup
+ fix last missing QPointer
parent
86a8d06e
Changes
1
Hide whitespace changes
Inline
Side-by-side
addons/git-blame/gitblametooltip.cpp
View file @
1532bffd
...
...
@@ -142,6 +142,8 @@ public:
setHorizontalScrollBarPolicy
(
Qt
::
ScrollBarAsNeeded
);
setVerticalScrollBarPolicy
(
Qt
::
ScrollBarAsNeeded
);
m_htmlHl
.
setDefinition
(
m_syntaxHlRepo
.
definitionForName
(
QStringLiteral
(
"Diff"
)));
auto
updateColors
=
[
this
](
KTextEditor
::
Editor
*
e
)
{
auto
theme
=
e
->
theme
();
m_htmlHl
.
setTheme
(
theme
);
...
...
@@ -163,7 +165,32 @@ public:
{
switch
(
event
->
type
())
{
case
QEvent
::
KeyPress
:
case
QEvent
::
ShortcutOverride
:
{
QKeyEvent
*
ke
=
static_cast
<
QKeyEvent
*>
(
event
);
if
(
ke
->
matches
(
QKeySequence
::
Copy
))
{
copy
();
}
else
if
(
ke
->
matches
(
QKeySequence
::
SelectAll
))
{
selectAll
();
}
event
->
accept
();
return
true
;
}
case
QEvent
::
KeyRelease
:
{
QKeyEvent
*
ke
=
static_cast
<
QKeyEvent
*>
(
event
);
if
(
ke
->
matches
(
QKeySequence
::
Copy
)
||
ke
->
matches
(
QKeySequence
::
SelectAll
)
||
ke
->
key
()
==
Qt
::
Key_Control
||
ke
->
key
()
==
Qt
::
Key_Alt
||
ke
->
key
()
==
Qt
::
Key_Shift
||
ke
->
key
()
==
Qt
::
Key_AltGr
||
ke
->
key
()
==
Qt
::
Key_Meta
)
{
event
->
accept
();
return
true
;
}
}
// fall through
case
QEvent
::
WindowActivate
:
case
QEvent
::
WindowDeactivate
:
hideTooltip
();
...
...
@@ -183,7 +210,7 @@ public:
setHtml
(
m_htmlHl
.
html
());
}
void
setView
(
KTextEditor
::
View
*
view
)
void
setView
(
QPointer
<
KTextEditor
::
View
>
view
)
{
// view changed?
// => update definition
...
...
@@ -195,12 +222,11 @@ public:
m_view
=
view
;
m_htmlHl
.
setDefinition
(
m_syntaxHlRepo
.
definitionForName
(
QStringLiteral
(
"Diff"
)));
updateFont
();
}
if
(
m_view
&&
m_view
->
focusProxy
())
{
m_view
->
focusProxy
()
->
installEventFilter
(
this
);
}
if
(
m_view
&&
m_view
->
focusProxy
())
{
m_view
->
focusProxy
()
->
installEventFilter
(
this
);
}
}
...
...
@@ -216,6 +242,9 @@ public:
Q_SLOT
void
hideTooltip
()
{
if
(
m_view
&&
m_view
->
focusProxy
())
{
m_view
->
focusProxy
()
->
removeEventFilter
(
this
);
}
close
();
setText
(
QString
());
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment