Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Utilities
Konsole
Commits
31969ef8
Commit
31969ef8
authored
Aug 23, 2020
by
Martin Tobias Holmedahl Sandsmark
Committed by
Kurt Hindenburg
Sep 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MainWindow does the resize tricks itself
parent
1faa50e6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
10 deletions
+2
-10
src/Application.cpp
src/Application.cpp
+2
-9
src/Application.h
src/Application.h
+0
-1
No files found.
src/Application.cpp
View file @
31969ef8
...
...
@@ -179,7 +179,7 @@ void Application::createWindow(const Profile::Ptr &profile, const QString &direc
{
MainWindow
*
window
=
newMainWindow
();
window
->
createSession
(
profile
,
directory
);
finalizeNewMainWindow
(
wind
ow
);
window
->
sh
ow
(
);
}
void
Application
::
detachTerminals
(
ViewSplitter
*
splitter
,
const
QHash
<
TerminalDisplay
*
,
Session
*>&
sessionsMap
)
...
...
@@ -258,7 +258,7 @@ int Application::newInstance()
// If not restoring size from last time or only adding new tab,
// resize window to chosen profile size (see Bug:345403)
if
(
createdNewMainWindow
)
{
finalizeNewMainWindow
(
wind
ow
);
window
->
sh
ow
(
);
}
else
{
window
->
setWindowState
(
window
->
windowState
()
&
(
~
Qt
::
WindowMinimized
|
Qt
::
WindowActive
));
window
->
show
();
...
...
@@ -609,10 +609,3 @@ void Application::slotActivateRequested(QStringList args, const QString & /*work
newInstance
();
}
void
Application
::
finalizeNewMainWindow
(
MainWindow
*
window
)
{
if
(
!
KonsoleSettings
::
saveGeometryOnExit
())
{
window
->
resize
(
window
->
sizeHint
());
}
window
->
show
();
}
src/Application.h
View file @
31969ef8
...
...
@@ -88,7 +88,6 @@ private:
QExplicitlySharedDataPointer
<
Profile
>
processProfileChangeArgs
(
QExplicitlySharedDataPointer
<
Profile
>
baseProfile
);
bool
processTabsFromFileArgs
(
MainWindow
*
window
);
void
createTabFromArgs
(
MainWindow
*
window
,
const
QHash
<
QString
,
QString
>
&
);
void
finalizeNewMainWindow
(
MainWindow
*
window
);
MainWindow
*
_backgroundInstance
;
QSharedPointer
<
QCommandLineParser
>
m_parser
;
...
...
Write
Preview
Markdown
is supported
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