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
System
Dolphin
Commits
ae46ab2c
Commit
ae46ab2c
authored
Aug 26, 2021
by
Eugene Popov
🇺🇦
Committed by
Méven Car
Aug 26, 2021
Browse files
Use default icon size when resetting zoom level
BUG: 437349
parent
5e84fffd
Pipeline
#76639
passed with stage
in 6 minutes and 1 second
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/views/dolphinview.cpp
View file @
ae46ab2c
...
...
@@ -7,7 +7,9 @@
#include
"dolphinview.h"
#include
"dolphin_compactmodesettings.h"
#include
"dolphin_detailsmodesettings.h"
#include
"dolphin_iconsmodesettings.h"
#include
"dolphin_generalsettings.h"
#include
"dolphinitemlistview.h"
#include
"dolphinnewfilemenuobserver.h"
...
...
@@ -1531,16 +1533,30 @@ QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh
void
DolphinView
::
resetZoomLevel
()
{
ViewModeSettings
::
ViewMode
mode
;
// TODO : Switch to using ViewModeSettings after MR #256 is merged
int
defaultIconSize
=
KIconLoader
::
SizeSmall
;
switch
(
m_mode
)
{
case
IconsView
:
mode
=
ViewModeSettings
::
IconsMode
;
break
;
case
CompactView
:
mode
=
ViewModeSettings
::
CompactMode
;
break
;
case
DetailsView
:
mode
=
ViewModeSettings
::
DetailsMode
;
break
;
case
IconsView
:
IconsModeSettings
::
self
()
->
useDefaults
(
true
);
defaultIconSize
=
IconsModeSettings
::
iconSize
();
IconsModeSettings
::
self
()
->
useDefaults
(
false
);
break
;
case
DetailsView
:
DetailsModeSettings
::
self
()
->
useDefaults
(
true
);
defaultIconSize
=
DetailsModeSettings
::
iconSize
();
DetailsModeSettings
::
self
()
->
useDefaults
(
false
);
break
;
case
CompactView
:
CompactModeSettings
::
self
()
->
useDefaults
(
true
);
defaultIconSize
=
CompactModeSettings
::
iconSize
();
CompactModeSettings
::
self
()
->
useDefaults
(
false
);
break
;
default:
Q_ASSERT
(
false
);
break
;
}
const
ViewModeSettings
settings
(
mode
);
const
QSize
iconSize
=
QSize
(
settings
.
iconSize
(),
settings
.
iconSize
());
setZoomLevel
(
ZoomLevelInfo
::
zoomLevelForIconSize
(
iconSize
));
setZoomLevel
(
ZoomLevelInfo
::
zoomLevelForIconSize
(
QSize
(
defaultIconSize
,
defaultIconSize
)));
}
void
DolphinView
::
observeCreatedItem
(
const
QUrl
&
url
)
...
...
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