Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2015-12-26 15:13:08 +01:00
commit aa294a79fa
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/CMakeLists.txt
View file

@ -236,6 +236,7 @@ IF(WITH_QT5)
${WINSDK_LIBRARY_DIR}/OpenGL32.lib ${WINSDK_LIBRARY_DIR}/OpenGL32.lib
${WINSDK_LIBRARY_DIR}/WinMM.Lib) ${WINSDK_LIBRARY_DIR}/WinMM.Lib)
ADD_QT_PLUGIN(platforms qwindows) ADD_QT_PLUGIN(platforms qwindows)
ADD_QT_LIBRARY(PlatformSupport)
ELSEIF(APPLE) ELSEIF(APPLE)
# Cups needs .dylib # Cups needs .dylib
SET(OLD_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) SET(OLD_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
@ -257,7 +258,9 @@ IF(WITH_QT5)
ADD_QT_PLUGIN(printsupport cocoaprintersupport) ADD_QT_PLUGIN(printsupport cocoaprintersupport)
ADD_QT_PLUGIN(platforms qcocoa) ADD_QT_PLUGIN(platforms qcocoa)
ADD_QT_LIBRARY(PlatformSupport)
ELSE() ELSE()
# order is very important there
ADD_QT_PLUGIN(platforms qxcb) ADD_QT_PLUGIN(platforms qxcb)
ADD_QT_PLUGIN(xcbglintegrations qxcb-glx-integration) ADD_QT_PLUGIN(xcbglintegrations qxcb-glx-integration)

6
code/nel/src/gui/group_html.cpp
View file

@ -5361,8 +5361,8 @@ namespace NLGUI
if (it->second == "lighter") if (it->second == "lighter")
{ {
const uint lighter[] = {100, 100, 100, 100, 100, 400, 400, 700, 700}; const uint lighter[] = {100, 100, 100, 100, 100, 400, 400, 700, 700};
int index = getFontWeight() / 100 - 1; uint index = getFontWeight() / 100 - 1;
clamp(index, 1, 9); clamp(index, 1u, 9u);
weight = lighter[index-1]; weight = lighter[index-1];
} }
else else
@ -5377,7 +5377,7 @@ namespace NLGUI
if (fromString(it->second, weight)) if (fromString(it->second, weight))
{ {
weight = (weight / 100); weight = (weight / 100);
clamp(weight, 1, 9); clamp(weight, 1u, 9u);
weight *= 100; weight *= 100;
} }
style.FontWeight = weight; style.FontWeight = weight;