Skip to content
GitLab
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
a26950bd
Commit
a26950bd
authored
Feb 11, 2022
by
Waqar Ahmed
Committed by
Christoph Cullmann
Feb 13, 2022
Browse files
Make sure url bar works after hide => show
parent
893cccb7
Changes
2
Hide whitespace changes
Inline
Side-by-side
kate/kateurlbar.cpp
View file @
a26950bd
...
...
@@ -149,47 +149,59 @@ KateUrlBar::KateUrlBar(KateViewSpace *parent)
m_layout
->
setSpacing
(
0
);
auto
*
vm
=
parent
->
viewManger
();
connect
(
vm
,
&
KateViewManager
::
viewChanged
,
this
,
[
this
,
vm
](
KTextEditor
::
View
*
v
)
{
if
(
vm
&&
!
vm
->
showUrlNavBar
())
{
return
;
}
m_paths
.
clear
();
connect
(
vm
,
&
KateViewManager
::
viewChanged
,
this
,
&
KateUrlBar
::
onViewChanged
);
QLayoutItem
*
l
;
while
((
l
=
m_layout
->
takeAt
(
0
))
!=
nullptr
)
{
delete
l
->
widget
();
delete
l
;
connect
(
vm
,
&
KateViewManager
::
showUrlNavBarChanged
,
this
,
[
this
,
vm
](
bool
show
)
{
setHidden
(
!
show
);
if
(
show
)
{
onViewChanged
(
vm
->
activeView
())
;
}
});
const
auto
url
=
v
->
document
()
->
url
();
if
(
url
.
isEmpty
())
{
hide
();
return
;
}
setHidden
(
!
vm
->
showUrlNavBar
());
}
auto
res
=
splittedUrl
(
url
);
const
auto
&
file
=
res
.
first
;
const
auto
&
dirs
=
res
.
second
;
if
(
dirs
.
isEmpty
()
||
file
.
isEmpty
())
{
hide
();
return
;
}
void
KateUrlBar
::
onViewChanged
(
KTextEditor
::
View
*
v
)
{
if
(
!
v
)
{
hide
();
return
;
}
for
(
const
auto
&
dir
:
dirs
)
{
m_layout
->
addWidget
(
dirButton
(
dir
.
name
,
dir
.
path
));
m_layout
->
addWidget
(
separatorLabel
());
}
m_layout
->
addWidget
(
fileLabel
(
file
));
m_layout
->
addStretch
();
if
(
isHidden
())
show
();
});
auto
*
vm
=
static_cast
<
KateViewSpace
*>
(
parentWidget
())
->
viewManger
();
if
(
vm
&&
!
vm
->
showUrlNavBar
())
{
return
;
}
m_paths
.
clear
();
connect
(
vm
,
&
KateViewManager
::
showUrlNavBarChanged
,
this
,
[
this
](
bool
show
)
{
setHidden
(
!
show
);
});
QLayoutItem
*
l
;
while
((
l
=
m_layout
->
takeAt
(
0
))
!=
nullptr
)
{
delete
l
->
widget
();
delete
l
;
}
setHidden
(
!
vm
->
showUrlNavBar
());
const
auto
url
=
v
->
document
()
->
url
();
if
(
url
.
isEmpty
())
{
hide
();
return
;
}
auto
res
=
splittedUrl
(
url
);
const
auto
&
file
=
res
.
first
;
const
auto
&
dirs
=
res
.
second
;
if
(
dirs
.
isEmpty
()
||
file
.
isEmpty
())
{
hide
();
return
;
}
for
(
const
auto
&
dir
:
dirs
)
{
m_layout
->
addWidget
(
dirButton
(
dir
.
name
,
dir
.
path
));
m_layout
->
addWidget
(
separatorLabel
());
}
m_layout
->
addWidget
(
fileLabel
(
file
));
m_layout
->
addStretch
();
if
(
isHidden
())
show
();
}
std
::
pair
<
QString
,
QVector
<
KateUrlBar
::
DirNamePath
>>
KateUrlBar
::
splittedUrl
(
const
QUrl
&
u
)
...
...
kate/kateurlbar.h
View file @
a26950bd
...
...
@@ -24,6 +24,7 @@ private:
QString
path
;
};
void
onViewChanged
(
KTextEditor
::
View
*
v
);
std
::
pair
<
QString
,
QVector
<
DirNamePath
>>
splittedUrl
(
const
QUrl
&
u
);
class
QLabel
*
separatorLabel
();
class
QToolButton
*
dirButton
(
const
QString
&
dirName
,
const
QString
&
path
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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