X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmdictionary%2Fqml%2FScrollBar.qml;h=5fba8af31492c52a7b51966be98c7cfdcbc46e07;hb=4d9f2607c5de55f0f8f0f7d44ad3e25accaa01da;hp=cf216d2c12a5023b7a252d4841e983ed86b4d9a1;hpb=a839861aef402b77ef5f86c5c9c9881ba86328af;p=mdictionary diff --git a/src/mdictionary/qml/ScrollBar.qml b/src/mdictionary/qml/ScrollBar.qml index cf216d2..5fba8af 100644 --- a/src/mdictionary/qml/ScrollBar.qml +++ b/src/mdictionary/qml/ScrollBar.qml @@ -1,44 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - import Qt 4.7 Item { @@ -56,7 +15,10 @@ Item { ny = scrollArea.visibleArea.yPosition * container.height; else ny = scrollArea.visibleArea.xPosition * container.width; - if (ny > 2) return ny; else return 2; + if (ny > 2) + return ny; + else + return 2; } function size() @@ -80,7 +42,8 @@ Item { else t = Math.ceil(container.width - 3 - ny); if (nh > t) return t; else return nh; - } else return nh + ny; + } else + return nh + ny; } //Rectangle { anchors.fill: parent; color: "Black"; opacity: 0.5 }