From 96a1e1d8c9d75cebbf1c6b182abf1b6df6b800cc Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sat, 2 Mar 2013 18:20:34 +0100 Subject: [PATCH] OP-857 OP-859 fixed various glitches in Commmunity panel: Show three lines of news instead of one; Fixed improper eliding of news text; Moved News scroll bar to the right so it won't overlap the news text; Removed clipping in Sites panel that caused the Os to be clipped. --- ground/openpilotgcs/src/plugins/welcome/qml/NewsPanel.qml | 6 ++++-- ground/openpilotgcs/src/plugins/welcome/qml/SitesPanel.qml | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/NewsPanel.qml b/ground/openpilotgcs/src/plugins/welcome/qml/NewsPanel.qml index 4d08f2d80..6d794b210 100644 --- a/ground/openpilotgcs/src/plugins/welcome/qml/NewsPanel.qml +++ b/ground/openpilotgcs/src/plugins/welcome/qml/NewsPanel.qml @@ -53,7 +53,7 @@ Item { spacing: 4 Text { text: title - width: view.width + width: view.width - 4 textFormat: text.indexOf("&") > 0 ? Text.StyledText : Text.PlainText elide: Text.ElideRight font.bold: true @@ -62,8 +62,10 @@ Item { Text { text: description - width: view.width + width: view.width - 4 textFormat: text.indexOf("&") > 0 ? Text.StyledText : Text.PlainText + maximumLineCount: 3 + wrapMode: Text.WordWrap elide: Text.ElideRight color: mouseArea.containsMouse ? "#224d81" : "black" } diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/SitesPanel.qml b/ground/openpilotgcs/src/plugins/welcome/qml/SitesPanel.qml index be6ddd9a4..e4c11bd86 100644 --- a/ground/openpilotgcs/src/plugins/welcome/qml/SitesPanel.qml +++ b/ground/openpilotgcs/src/plugins/welcome/qml/SitesPanel.qml @@ -32,10 +32,9 @@ Item { ListView { id: view width: parent.width - anchors { top: header.bottom; topMargin: 14; bottom: parent.bottom } + anchors { top: header.bottom; topMargin: 14; leftMargin: 32; bottom: parent.bottom } model: sitesModel spacing: 8 - clip: true delegate: Text { text: title