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

adopt for Qt6

Browse Source
This commit is contained in:
Пелипенко Иван
2025-01-06 12:56:06 +03:00
parent c6b2bb128a
commit 266e9ac351
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/doc/CMakeLists.txt
View File

@@ -20,6 +20,7 @@ if (MARKDOWN_LIBRARY)
qad_library(doc "Core" "${MARKDOWN_LIBRARY}") qad_library(doc "Core" "${MARKDOWN_LIBRARY}")
if(NOT _mkd_header_found) if(NOT _mkd_header_found)
message(STATUS "Found markdown library, but *.h missing!") message(STATUS "Found markdown library, but *.h missing!")
add_definitions("-DMARKDOWN_HEADER=\"markdown/markdown.h\"")
endif() endif()
else() else()
add_definitions("-DNO_MARKDOWN") add_definitions("-DNO_MARKDOWN")

1
libs/graphic/graphic.cpp
View File

@@ -193,6 +193,7 @@ Graphic::Graphic(QWidget * parent): QFrame(parent), canvas(0), line_x_min(this),
selpen = palette().color(QPalette::WindowText); selpen = palette().color(QPalette::WindowText);
selpen.setStyle(Qt::DashLine); selpen.setStyle(Qt::DashLine);
back_color = palette().color(QPalette::Base); back_color = palette().color(QPalette::Base);
back_color.setAlpha(255);
buttons_ = AllButtons; buttons_ = AllButtons;
setOpenGL(false); setOpenGL(false);
setButtonsPosition(Graphic::Left); setButtonsPosition(Graphic::Left);

1
libs/map/osm_types_p.h
View File

@@ -20,6 +20,7 @@
#ifndef osm_types_h #ifndef osm_types_h
#define osm_types_h #define osm_types_h
#include <QMetaType>
#include <QPixmap> #include <QPixmap>
namespace OSM { namespace OSM {

4
libs/virtual_keyboard/virtual_keyboard.cpp
View File

@@ -121,7 +121,9 @@ void VirtualKeyboard::adjust() {
cols = piMaxi(cols, p->buttonColumns()); cols = piMaxi(cols, p->buttonColumns());
if (cols < 1) return; if (cols < 1) return;
int spacing = style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, nullptr, this); int spacing = style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, nullptr, this);
int pixel_width = width() - spacing * (cols - 1) - ui->verticalLayout->margin() * 2; 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); int bw = piMaxi(2, pixel_width / cols);
ui->stackedPages->setStyleSheet(QString("font:%1px").arg(bw / 2)); ui->stackedPages->setStyleSheet(QString("font:%1px").arg(bw / 2));
for (auto p: pages) for (auto p: pages)