Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include <qtypes.h>
#include <QPainter>
#include <QVBoxLayout>
#include <app/utils/DevicePixelScale.hpp>
Expand Down
5 changes: 3 additions & 2 deletions libs/gui/controls/src/app/controls/WordWrap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,8 @@ namespace quick_dra::gui {
if (bold != isBold || italic != isItalic) {
return;
}
auto const str = QString{letters.sliceInto(text)};
auto const view = letters.sliceInto(text);
auto const str = QString{view.data(), view.size()};
pos.advance = fm.horizontalAdvance(str);
pos.boundingBox = fm.boundingRect(str);
#ifdef DEBUG_MD
Expand Down Expand Up @@ -604,7 +605,7 @@ namespace quick_dra::gui {
if (span.isBold == isBold && span.isItalic == isItalic) {
auto const view = span.letters.sliceInto(markdownClearedText);

painter->drawText(QPointF{advance, baseline}, QString{view});
painter->drawText(QPointF{advance, baseline}, QString{view.data(), view.size()});
}

advance += span.pos.advance;
Expand Down
1 change: 0 additions & 1 deletion libs/gui/gui/include/app/gui/PageHeader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <QLabel>
#include <QToolBar>
#include <QWidget>
#include <QtTypes>
#include <app/gui/HeaderTitle.hpp>
#include <app/gui/types.hpp>

Expand Down
6 changes: 6 additions & 0 deletions libs/gui/main/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ if (UNIX)
ARGS -E copy quick-dra.desktop "${PROJECT_BINARY_DIR}/share/applications/quick-dra.desktop"
COMMAND "${CMAKE_COMMAND}"
ARGS -E copy appicon.svg "${PROJECT_BINARY_DIR}/share/icons/hicolor/scalable/apps/quick-dra.svg"
COMMAND "${CMAKE_COMMAND}"
ARGS -E copy appicon-16.svg "${PROJECT_BINARY_DIR}/share/icons/hicolor/16x16/apps/quick-dra.svg"
COMMAND "${CMAKE_COMMAND}"
ARGS -E copy appicon-24.svg "${PROJECT_BINARY_DIR}/share/icons/hicolor/24x24/apps/quick-dra.svg"
COMMAND "${CMAKE_COMMAND}"
ARGS -E copy appicon-32.svg "${PROJECT_BINARY_DIR}/share/icons/hicolor/32x32/apps/quick-dra.svg"
)
endif()

Expand Down
1 change: 0 additions & 1 deletion libs/gui/pages/src/app/main/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <app/pages/HomePage.hpp>
#include <format>
#include <quick_dra/version.hpp>
#include <string> // used by temp slot

using namespace std::literals;

Expand Down