[app] Slightly tweaked the toolbar

This commit is contained in:
Slava Monich 2019-04-01 01:25:37 +03:00
parent e1f75ed04a
commit 9422fa4f68

View file

@ -1,6 +1,6 @@
/* /*
Copyright (C) 2015-2017 Jolla Ltd. Copyright (C) 2015-2019 Jolla Ltd.
Contact: Slava Monich <slava.monich@jolla.com> Copyright (C) 2015-2019 Slava Monich <slava.monich@jolla.com>
You may use this file under the terms of BSD license as follows: You may use this file under the terms of BSD license as follows:
@ -8,14 +8,15 @@
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
* Redistributions of source code must retain the above copyright 1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer
documentation and/or other materials provided with the distribution. in the documentation and/or other materials provided with the
* Neither the name of Jolla Ltd nor the names of its contributors may distribution.
be used to endorse or promote products derived from this software 3. Neither the names of the copyright holders nor the names of its
without specific prior written permission. contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@ -51,7 +52,7 @@ Item {
MouseArea { MouseArea {
id: dayNightModeSwitch id: dayNightModeSwitch
height: parent.height height: parent.height
width: leftMargin + dayModeImage.width + spacing width: leftMargin + Theme.iconSizeSmall + spacing
anchors { anchors {
left: parent.left left: parent.left
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -66,7 +67,7 @@ Item {
leftMargin: pageTools.leftMargin leftMargin: pageTools.leftMargin
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
sourceSize.height: Theme.iconSizeMedium sourceSize.height: Theme.iconSizeSmall
opacity: Settings.invertColors ? 0.5 : 0 opacity: Settings.invertColors ? 0.5 : 0
visible: opacity > 0 visible: opacity > 0
Behavior on opacity { FadeAnimation {} } Behavior on opacity { FadeAnimation {} }
@ -74,8 +75,8 @@ Item {
Image { Image {
source: "images/night-mode.svg" source: "images/night-mode.svg"
anchors.fill: dayModeImage anchors.centerIn: dayModeImage
sourceSize.height: height sourceSize.height: Theme.iconSizeSmall
opacity: Settings.invertColors ? 0 : 0.25 opacity: Settings.invertColors ? 0 : 0.25
visible: opacity > 0 visible: opacity > 0
Behavior on opacity { FadeAnimation {} } Behavior on opacity { FadeAnimation {} }