Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 14:09:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Initial fix - need a little style fixing

Browse source
This commit is contained in:
Liv Erickson 2018-02-21 15:44:23 -08:00
parent 9e1ea191b3
commit 68f0c0391a
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/resources/qml/hifi/tablet/EditTabView.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls 2.2 // Need both for short-term fix
import QtWebEngine 1.1 import QtWebEngine 1.1
import QtWebChannel 1.0 import QtWebChannel 1.0
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
@ -10,6 +11,7 @@ import "../../controls-uit" as HifiControls
import "../../styles-uit" import "../../styles-uit"
TabView { TabView {
id: editTabView id: editTabView
// anchors.fill: parent // anchors.fill: parent
@ -23,8 +25,25 @@ TabView {
Rectangle { Rectangle {
color: "#404040" color: "#404040"
id: container
Flickable {
height: parent.height
width: parent.width
contentHeight: createEntitiesFlow.height + importButton.height + assetServerButton.height + 153
contentWidth: width
ScrollBar.vertical : ScrollBar {
visible: parent.contentHeight > parent.height
width: 20
background: Rectangle {
color: hifi.colors.tableScrollBackgroundDark
}
}
Text { Text {
id: header
color: "#ffffff" color: "#ffffff"
text: "Choose an Entity Type to Create:" text: "Choose an Entity Type to Create:"
font.pixelSize: 14 font.pixelSize: 14
@ -176,6 +195,7 @@ TabView {
} }
HifiControls.Button { HifiControls.Button {
id: importButton
text: "Import Entities (.json)" text: "Import Entities (.json)"
color: hifi.buttons.black color: hifi.buttons.black
colorScheme: hifi.colorSchemes.dark colorScheme: hifi.colorSchemes.dark
@ -192,6 +212,7 @@ TabView {
} }
} }
} }
} // Flickable
} }
Tab { Tab {