Merge branch 'master' into compatibility

modules/FindMagnum.cmake

@@ -318,6 +318,7 @@ if(NOT MAGNUM_TARGET_GLES)
 endif()
 
 # Installation dirs
+include(CorradeLibSuffix)
 set(MAGNUM_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
 set(MAGNUM_PLUGINS_INSTALL_DIR ${MAGNUM_LIBRARY_INSTALL_DIR}/magnum)
 set(MAGNUM_PLUGINS_FONT_INSTALL_DIR ${MAGNUM_PLUGINS_INSTALL_DIR}/fonts)

src/Platform/CMakeLists.txt

@@ -84,9 +84,9 @@ if(WITH_WINDOWLESSNACLAPPLICATION)
     install(TARGETS MagnumWindowlessNaClApplication DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
 endif()
 
-# JavaScript stuff for NaCl
+# JavaScript and CSS stuff for NaCl
 if(WITH_NACLAPPLICATION OR WITH_WINDOWLESSNACLAPPLICATION)
-    install(FILES NaClApplication.js DESTINATION ${MAGNUM_DATA_INSTALL_DIR})
+    install(FILES NaClApplication.js NaClApplication.css DESTINATION ${MAGNUM_DATA_INSTALL_DIR})
 endif()
 
 # GLX application

src/Platform/magnum-info-nacl.html

@@ -5,6 +5,7 @@
 <link rel="stylesheet" href="NaClApplication.css" />
 <style type="text/css">
 #module {
+    position: absolute;
     visibility: hidden; /* The module doesn't display anything */
 }
 

src/Text/GlyphCache.h

@@ -56,6 +56,8 @@ font->createGlyphCache(cache, "abcdefghijklmnopqrstuvwxyz"
 
 See TextRenderer for information about text rendering.
 @todo Some way for Font to negotiate or check internal texture format
+@todo Default glyph 0 with rect 0 0 0 0 will result in negative dimensions when
+    nonzero padding is removed
 */
 class MAGNUM_TEXT_EXPORT GlyphCache {
     public: