From 266e9ac3512047b01f6d52441ff0ef2d04a54e36 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 6 Jan 2025 12:56:06 +0300 Subject: [PATCH] adopt for Qt6 --- libs/doc/CMakeLists.txt | 1 + libs/graphic/graphic.cpp | 3 ++- libs/map/osm_types_p.h | 1 + libs/virtual_keyboard/virtual_keyboard.cpp | 6 ++++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/doc/CMakeLists.txt b/libs/doc/CMakeLists.txt index 0457fe1..824441d 100644 --- a/libs/doc/CMakeLists.txt +++ b/libs/doc/CMakeLists.txt @@ -20,6 +20,7 @@ if (MARKDOWN_LIBRARY) qad_library(doc "Core" "${MARKDOWN_LIBRARY}") if(NOT _mkd_header_found) message(STATUS "Found markdown library, but *.h missing!") + add_definitions("-DMARKDOWN_HEADER=\"markdown/markdown.h\"") endif() else() add_definitions("-DNO_MARKDOWN") diff --git a/libs/graphic/graphic.cpp b/libs/graphic/graphic.cpp index 98aa24c..c6b2b10 100644 --- a/libs/graphic/graphic.cpp +++ b/libs/graphic/graphic.cpp @@ -193,7 +193,8 @@ Graphic::Graphic(QWidget * parent): QFrame(parent), canvas(0), line_x_min(this), selpen = palette().color(QPalette::WindowText); selpen.setStyle(Qt::DashLine); back_color = palette().color(QPalette::Base); - buttons_ = AllButtons; + back_color.setAlpha(255); + buttons_ = AllButtons; setOpenGL(false); setButtonsPosition(Graphic::Left); setAntialiasing(false); diff --git a/libs/map/osm_types_p.h b/libs/map/osm_types_p.h index 9783678..f71c795 100644 --- a/libs/map/osm_types_p.h +++ b/libs/map/osm_types_p.h @@ -20,6 +20,7 @@ #ifndef osm_types_h #define osm_types_h +#include #include namespace OSM { diff --git a/libs/virtual_keyboard/virtual_keyboard.cpp b/libs/virtual_keyboard/virtual_keyboard.cpp index d8818d0..5d1fea4 100644 --- a/libs/virtual_keyboard/virtual_keyboard.cpp +++ b/libs/virtual_keyboard/virtual_keyboard.cpp @@ -120,8 +120,10 @@ void VirtualKeyboard::adjust() { for (auto p: pages) cols = piMaxi(cols, p->buttonColumns()); if (cols < 1) return; - int spacing = style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, nullptr, this); - int pixel_width = width() - spacing * (cols - 1) - ui->verticalLayout->margin() * 2; + int spacing = style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, nullptr, this); + int m[4] = {0, 0, 0, 0}; + ui->verticalLayout->getContentsMargins(&m[0], &m[1], &m[2], &m[3]); + int pixel_width = width() - spacing * (cols - 1) - m[0] * 2; int bw = piMaxi(2, pixel_width / cols); ui->stackedPages->setStyleSheet(QString("font:%1px").arg(bw / 2)); for (auto p: pages)