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
f4b885a8
Commit
f4b885a8
authored
Jun 12, 2016
by
Dominik Haumann
Browse files
Correctly restore view config of all split views
BUG: 353852
REVIEW: 128163
parent
9b8fbe6a
Changes
3
Hide whitespace changes
Inline
Side-by-side
kate/kateviewmanager.cpp
View file @
f4b885a8
...
...
@@ -430,10 +430,10 @@ void KateViewManager::documentSavedOrUploaded(KTextEditor::Document *doc, bool)
}
}
bool
KateViewManager
::
createView
(
KTextEditor
::
Document
*
doc
,
KateViewSpace
*
vs
)
KTextEditor
::
View
*
KateViewManager
::
createView
(
KTextEditor
::
Document
*
doc
,
KateViewSpace
*
vs
)
{
if
(
m_blockViewCreationAndActivation
)
{
return
false
;
return
nullptr
;
}
// create doc
...
...
@@ -472,7 +472,7 @@ bool KateViewManager::createView(KTextEditor::Document *doc, KateViewSpace *vs)
activateView
(
view
);
}
return
true
;
return
view
;
}
bool
KateViewManager
::
deleteView
(
KTextEditor
::
View
*
view
)
...
...
kate/kateviewmanager.h
View file @
f4b885a8
...
...
@@ -113,9 +113,10 @@ Q_SIGNALS:
public:
/**
* create and activate a new view for doc, if doc == 0, then
* create a new document
* create a new document.
* Can return NULL.
*/
bool
createView
(
KTextEditor
::
Document
*
doc
=
0L
,
KateViewSpace
*
vs
=
nullptr
);
KTextEditor
::
View
*
createView
(
KTextEditor
::
Document
*
doc
=
0L
,
KateViewSpace
*
vs
=
nullptr
);
private:
bool
deleteView
(
KTextEditor
::
View
*
view
);
...
...
kate/kateviewspace.cpp
View file @
f4b885a8
...
...
@@ -653,9 +653,10 @@ void KateViewSpace::restoreConfig(KateViewManager *viewMan, const KConfigBase *c
QString
vgroup
=
QString
::
fromLatin1
(
"%1 %2"
).
arg
(
groupname
).
arg
(
fn
);
KConfigGroup
configGroup
(
config
,
vgroup
);
viewMan
->
createView
(
doc
,
this
);
viewMan
->
activeView
()
->
readSessionConfig
(
configGroup
);
auto
view
=
viewMan
->
createView
(
doc
,
this
);
if
(
view
)
{
view
->
readSessionConfig
(
configGroup
);
}
}
}
...
...
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