From ce168eed2c616711521d233702c0b25e4ead602e Mon Sep 17 00:00:00 2001 From: akashihi Date: Tue, 23 Mar 2010 15:23:07 +0000 Subject: [PATCH] Fix:gui/qml:Made ListSelector size dynamic git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3078 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/gui/qml/skins/navit/ListSelector.qml | 6 +++--- navit/navit/gui/qml/skins/navit/PageSearchSelector.qml | 7 +++---- navit/navit/gui/qml/skins/navit/PageSettingsDisplay.qml | 1 + navit/navit/gui/qml/skins/navit/PageSettingsVehicle.qml | 5 ++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/navit/navit/gui/qml/skins/navit/ListSelector.qml b/navit/navit/gui/qml/skins/navit/ListSelector.qml index 378b7c4..bc354a9 100644 --- a/navit/navit/gui/qml/skins/navit/ListSelector.qml +++ b/navit/navit/gui/qml/skins/navit/ListSelector.qml @@ -3,7 +3,7 @@ import Qt 4.6 Rectangle { id: listselector - width: labelTxt.width + 40 + 180; height: 60 + width: parent.width; height: parent.height color: "Black" @@ -21,7 +21,7 @@ Rectangle { id: delegate Item { id: wrapper - width: 180; height: 20 + width: list.width; height: 20 Column { x: 5; y: 5 Text { text: itemName; color: "White" } @@ -50,7 +50,7 @@ Rectangle { ListView { id: list; - width: 180; height: 60 + width: listselector.width*0.8; height: listselector.height anchors.top: labelTxt.bottom; anchors.left: listselector.left model: listModel diff --git a/navit/navit/gui/qml/skins/navit/PageSearchSelector.qml b/navit/navit/gui/qml/skins/navit/PageSearchSelector.qml index 9346e76..0d2d3e6 100644 --- a/navit/navit/gui/qml/skins/navit/PageSearchSelector.qml +++ b/navit/navit/gui/qml/skins/navit/PageSearchSelector.qml @@ -31,10 +31,9 @@ Rectangle { ListSelector { id:layoutList; text: search.searchContext; itemId: search.getAttrList(search.searchContext); onChanged: setSearchResult() - anchors.top: parent.top; - anchors.left: parent.left; anchors.leftMargin: 3 - anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32 + anchors.top: parent.top; anchors.left: parent.left; anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32 + width: page.width; height: page.height/2-cellar.height } - Cellar {anchors.bottom: page.bottom; anchors.horizontalCenter: page.horizontalCenter; width: page.width } + Cellar {id: cellar; anchors.bottom: page.bottom; anchors.horizontalCenter: page.horizontalCenter; width: page.width } } diff --git a/navit/navit/gui/qml/skins/navit/PageSettingsDisplay.qml b/navit/navit/gui/qml/skins/navit/PageSettingsDisplay.qml index f378f42..8bf673a 100644 --- a/navit/navit/gui/qml/skins/navit/PageSettingsDisplay.qml +++ b/navit/navit/gui/qml/skins/navit/PageSettingsDisplay.qml @@ -45,6 +45,7 @@ Rectangle { anchors.top: parent.top; anchors.left: parent.left; anchors.leftMargin: 3 anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32 + width: page.width/2; height: page.height*0.25 } Grid { columns: 1; rows: 3 diff --git a/navit/navit/gui/qml/skins/navit/PageSettingsVehicle.qml b/navit/navit/gui/qml/skins/navit/PageSettingsVehicle.qml index dbffd7d..1bf134f 100644 --- a/navit/navit/gui/qml/skins/navit/PageSettingsVehicle.qml +++ b/navit/navit/gui/qml/skins/navit/PageSettingsVehicle.qml @@ -21,13 +21,12 @@ Rectangle { ListSelector { id:vehicleList; text: "Current vehicle profile"; itemId: navit.getAttrList("vehicle"); onChanged: {navit.setObjectByName("vehicle",vehicleList.value) } anchors.top: parent.top; anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32 - anchors.left: parent.left; + anchors.left: parent.left; width: page.width/2;height: page.height/2 } - ButtonIcon { id: btnVehicle; text: "Vehicle options"; icon: "gui_vehicle.svg"; onClicked: gui.setPage("PageSettingsVehicleOptions.qml") anchors.verticalCenter: vehicleList.verticalCenter; anchors.leftMargin: gui.width/32 - anchors.left: vehicleList.horizontalCenter; + anchors.left: vehicleList.right; } Cellar {anchors.bottom: page.bottom; anchors.horizontalCenter: page.horizontalCenter; width: page.width } -- 2.7.4