SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@427 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2018-09-24 09:24:40 +00:00
parent 347eaa679e
commit af1d5daef8
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -16,6 +16,9 @@ include(SDKMacros.cmake)
set(LIBPROJECT 1) set(LIBPROJECT 1)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/")
include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip) include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip)
if(APPLE)
include_directories(/usr/local/include)
endif()
if(MINGW) if(MINGW)
find_package(MinGW REQUIRED) find_package(MinGW REQUIRED)
endif() endif()

5
qad/graphic/graphic.cpp
View File

@@ -1459,7 +1459,10 @@ void Graphic::updateLegend(bool es) {
QPixmap pix(60, 22); QPixmap pix(60, 22);
pix.fill(back_color); pix.fill(back_color);
QPainter p(&pix); QPainter p(&pix);
p.setPen(graphics[i].pen); QPen pen = graphics[i].pen;
if (qRound(pen.widthF()) == pen.widthF()) pen.setWidth(pen.width()*thick);
else pen.setWidthF(pen.widthF()*thick);
p.setPen(pen);
p.drawLine(0, pix.height() / 2, pix.width(), pix.height() / 2); p.drawLine(0, pix.height() / 2, pix.width(), pix.height() / 2);
p.end(); p.end();
graphics[i].icon = QIcon(pix); graphics[i].icon = QIcon(pix);