Skip to content

Commit 2540819

Browse files
addpkg(x11/drawy): 1.0.1
1 parent 5c18502 commit 2540819

3 files changed

Lines changed: 78 additions & 0 deletions

File tree

x11-packages/drawy/build.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
TERMUX_PKG_HOMEPAGE="https://invent.kde.org/graphics/drawy"
2+
TERMUX_PKG_DESCRIPTION="Handy, infinite brainstorming tool"
3+
TERMUX_PKG_LICENSE="GPL-3.0-or-later"
4+
TERMUX_PKG_MAINTAINER="@termux"
5+
TERMUX_PKG_VERSION="1.0.1"
6+
TERMUX_PKG_SRCURL="https://download.kde.org/stable/drawy/${TERMUX_PKG_VERSION}/drawy-${TERMUX_PKG_VERSION}.tar.xz"
7+
TERMUX_PKG_SHA256="3bf3764784d6c8cfd80bd4fd639d73eaedc4c88889c03215d3add25f685ab227"
8+
TERMUX_PKG_AUTO_UPDATE=true
9+
TERMUX_PKG_DEPENDS="kf6-kcolorscheme, kf6-kconfig, kf6-kconfigwidgets, kf6-kcoreaddons, kf6-kcrash, kf6-ki18n, kf6-kiconthemes, kf6-kwidgetsaddons, kf6-kxmlgui, kf6-syntax-highlighting, libc++, qt6-qtbase, zstd"
10+
TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules, kf6-kdoctools"
11+
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
12+
-DCMAKE_SYSTEM_NAME=Linux
13+
-DKDE_INSTALL_QMLDIR=lib/qt6/qml
14+
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
15+
"
16+
17+
termux_step_pre_configure() {
18+
if [[ "$TERMUX_ON_DEVICE_BUILD" == "false" ]]; then
19+
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DKF6_HOST_TOOLING=$TERMUX_PREFIX/opt/kf6/cross/lib/cmake/"
20+
fi
21+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 036890e..a7970b1 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -197,7 +197,6 @@ ecm_qt_install_logging_categories(
6+
DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
7+
)
8+
9+
-update_xdg_mimetypes(${KDE_INSTALL_MIMEDIR})
10+
ki18n_install(po)
11+
if(KF6DocTools_FOUND)
12+
kdoctools_install(po)
13+
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
14+
index c76f3eb..cbe4965 100644
15+
--- a/src/data/CMakeLists.txt
16+
+++ b/src/data/CMakeLists.txt
17+
@@ -4,5 +4,4 @@ if(UNIX AND NOT APPLE)
18+
install(PROGRAMS org.kde.drawy.desktop DESTINATION ${KDE_INSTALL_APPDIR})
19+
install(FILES org.kde.drawy.metainfo.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
20+
install(FILES application-x-drawy.xml DESTINATION ${KDE_INSTALL_MIMEDIR})
21+
- update_xdg_mimetypes(${KDE_INSTALL_MIMEDIR})
22+
endif()
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
diff --git a/src/gui/item/text.cpp b/src/gui/item/text.cpp
2+
index 1a894b1..441e196 100644
3+
--- a/src/gui/item/text.cpp
4+
+++ b/src/gui/item/text.cpp
5+
@@ -205,7 +205,7 @@ qsizetype TextItem::getIndexFromX(double xPos, int lineNumber) const
6+
{
7+
const QFontMetricsF metrics{getFont()};
8+
9+
- auto [start, end] = getLineRange(lineNumber);
10+
+ auto [start, end] = getLineRangeForLine(lineNumber);
11+
const QString line{m_text.mid(start, end - start + 1)};
12+
13+
const double distanceFromLeft{std::max(xPos - m_boundingBox.x(), 0.0)};
14+
@@ -390,7 +390,7 @@ QPen TextItem::getPen() const
15+
return pen;
16+
}
17+
18+
-std::pair<qsizetype, qsizetype> TextItem::getLineRange(int lineNumber) const
19+
+std::pair<qsizetype, qsizetype> TextItem::getLineRangeForLine(int lineNumber) const
20+
{
21+
const qsizetype len{m_text.length()};
22+
23+
diff --git a/src/gui/item/text.hpp b/src/gui/item/text.hpp
24+
index 813a2cd..34234c8 100644
25+
--- a/src/gui/item/text.hpp
26+
+++ b/src/gui/item/text.hpp
27+
@@ -55,7 +55,7 @@ public:
28+
29+
[[nodiscard]] bool hasSelection() const;
30+
31+
- [[nodiscard]] std::pair<qsizetype, qsizetype> getLineRange(int lineNumber) const;
32+
+ [[nodiscard]] std::pair<qsizetype, qsizetype> getLineRangeForLine(int lineNumber) const;
33+
[[nodiscard]] std::pair<qsizetype, qsizetype> getLineRange(qsizetype position) const;
34+
35+
[[nodiscard]] qsizetype getPrevBreak(qsizetype pos) const;

0 commit comments

Comments
 (0)