Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 22:22:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click

Browse source
This commit is contained in:
Vladyslav Stelmakhovskyi 2017-03-10 19:53:12 +01:00
parent bc338a0852
commit e27ccab2f4
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/dialogs/TabletFileDialog.qml
View file

@ -66,8 +66,6 @@ TabletModalWindow {
signal canceled(); signal canceled();
Component.onCompleted: { Component.onCompleted: {
console.log("Helper " + helper + " drives " + drives);
fileDialogItem.keyboardEnabled = HMD.active; fileDialogItem.keyboardEnabled = HMD.active;
// HACK: The following lines force the model to initialize properly such that the go-up button // HACK: The following lines force the model to initialize properly such that the go-up button
@ -459,6 +457,7 @@ TabletModalWindow {
bottomMargin: hifi.dimensions.contentSpacing.y + currentSelection.controlHeight - currentSelection.height bottomMargin: hifi.dimensions.contentSpacing.y + currentSelection.controlHeight - currentSelection.height
} }
headerVisible: !selectDirectory headerVisible: !selectDirectory
onClicked: navigateToRow(row);
onDoubleClicked: navigateToRow(row); onDoubleClicked: navigateToRow(row);
focus: true focus: true
Keys.onReturnPressed: navigateToCurrentRow(); Keys.onReturnPressed: navigateToCurrentRow();

1
libraries/gl/src/gl/OffscreenQmlSurface.cpp
View file

@ -434,6 +434,7 @@ void OffscreenQmlSurface::create(QOpenGLContext* shareContext) {
auto rootContext = getRootContext(); auto rootContext = getRootContext();
rootContext->setContextProperty("urlHandler", new UrlHandler()); rootContext->setContextProperty("urlHandler", new UrlHandler());
rootContext->setContextProperty("resourceDirectoryUrl", QUrl::fromLocalFile(PathUtils::resourcesPath())); rootContext->setContextProperty("resourceDirectoryUrl", QUrl::fromLocalFile(PathUtils::resourcesPath()));
rootContext->setContextProperty("pathToFonts", "../../");
} }
static uvec2 clampSize(const uvec2& size, uint32_t maxDimension) { static uvec2 clampSize(const uvec2& size, uint32_t maxDimension) {