Merge pull request #86 from zbanks/minor-tweaks

Minor bugfixes
zbanks · Nov 1, 2018 · 595b8f3 · 595b8f3
2 parents ee54e2e + f0205f8
commit 595b8f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -130,6 +130,13 @@ set_target_properties(radiance PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOUR
 target_link_libraries(libradiance ${radiance_LIBRARIES})
 target_link_libraries(radiance libradiance ${radiance_LIBRARIES})
 
+install(CODE "
+ if(NOT \"${RADIANCE_SYSTEM_RESOURCES}\" STREQUAL \"${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")
+ MESSAGE(\"For an install to work, RADIANCE_SYSTEM_RESOURCES must be set to '\\\${CMAKE_INSTALL_PREFIX}share/${PROJECT_NAME}/'\")
+ MESSAGE(FATAL_ERROR \"Please recompile with cmake -DRADIANCE_SYSTEM_RESOURCES=${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")
+ endif()
+")
+
 INSTALL(TARGETS radiance
  DESTINATION bin
 )

diff --git a/resources/qml/ConsoleWidget.qml b/resources/qml/ConsoleWidget.qml
@@ -121,7 +121,7 @@ Item {
  if (count == 0) popIn();
  }
  onContentHeightChanged: {
- contentY = contentHeight - height;
+ contentY = Math.max(contentHeight - height, 0);
  }
 
  ScrollIndicator.vertical: ScrollIndicator {}