Skip to content
Snippets Groups Projects
Commit 3e012c32 authored by Liam Coursodon's avatar Liam Coursodon Committed by Liam Coursodon
Browse files

Welcome view: set default title to false and resize logo

GitLab: #1334

Change-Id: I71930584b3f5e0925ba8f5f42fff669ff9237dd1
parent 6bff3c54
No related branches found
No related tags found
No related merge requests found
......@@ -543,7 +543,7 @@ Item {
property real welcomeRectTopMargin: 90
property real welcomePageSpacing: 13
property real welcomeGridWidth: 3 * JamiTheme.tipBoxWidth + 2 * JamiTheme.welcomePageSpacing
property real welcomeHalfGridWidth: (welcomeGridWidth - JamiTheme.welcomePageSpacing) / 2
property real welcomeThirdGridWidth: (welcomeGridWidth - JamiTheme.welcomePageSpacing) / 3
property real welcomeShortGridWidth: 2 * JamiTheme.tipBoxWidth + JamiTheme.welcomePageSpacing
readonly property string welcomeBg: darkTheme ? JamiResources.background_don_dark_jpg : JamiResources.background_don_white_jpg
property color welcomeBlockColor: darkTheme ? "#4D000000" : "#4DFFFFFF"
......
......@@ -31,7 +31,7 @@ Item {
property color textColor: JamiTheme.textColor
property color idColor: JamiTheme.welcomeBlockColor
property color contentIdColor: JamiTheme.tintedBlue
property bool hasTitle: true
property bool hasTitle: false
property bool hasDescription: true
property string title: JamiStrings.welcomeToJami
......@@ -129,7 +129,7 @@ Item {
width: welcomeInfo.contentWidth
height: contentHeight
font.pixelSize: JamiTheme.headerFontSize
font.pixelSize: JamiTheme.tipBoxContentFontSize
wrapMode: Text.WordWrap
......
......@@ -36,11 +36,11 @@ Item {
width: getWidth()
function getWidth() {
return JamiTheme.welcomeHalfGridWidth;
return JamiTheme.welcomeThirdGridWidth;
}
function getHeight() {
return 120;
return 80;
}
CachedImage {
......
......@@ -49,7 +49,7 @@ ListSelectionView {
property bool hasCustomUi: false
property bool hasTitle: true
property bool hasTitle: false
property bool hasDescription: true
property bool hasCustomTitle: false
......@@ -95,7 +95,7 @@ ListSelectionView {
function updateUiFlags() {
hasCustomUi = Object.keys(uiCustomization).length > 0;
hasTitle = hasCustomUi ? uiCustomization.title !== "" : true;
hasTitle = hasCustomUi ? uiCustomization.title !== "" : false;
hasDescription = hasCustomUi ? uiCustomization.description !== "" : true;
title = hasCustomUi && uiCustomization.title !== undefined ? uiCustomization.title : JamiStrings.welcomeToJami;
description = hasCustomUi && uiCustomization.description !== undefined ? uiCustomization.description : JamiStrings.hereIsIdentifier;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment