Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add QFontMetrics support #898

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Support for further types: `QLine`, `QLineF`, `QImage`, `QPainter`, `QFont`, `QPen`, `QPolygon`, `QPolygonF`
- Support for further types: `QLine`, `QLineF`, `QImage`, `QPainter`, `QFont`, `QPen`, `QPolygon`, `QPolygonF`, `QFontMetrics`
- `internal_pointer_mut()` function on `QModelIndex`
- `c_void` in CXX-Qt-lib for easy access to `void *`
- `CxxQtThread` is now marked as `Sync` so that it can be used by reference
Expand Down
22 changes: 22 additions & 0 deletions crates/cxx-qt-lib-headers/include/gui/qfontmetrics.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// clang-format off
// SPDX-FileCopyrightText: 2024 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
// clang-format on
// SPDX-FileContributor: Laurent Montel <laurent.montel@kdab.com>
//
// SPDX-License-Identifier: MIT OR Apache-2.0
#pragma once

#include <QtGui/QFontMetrics>

#include "rust/cxx.h"

// Define namespace otherwise we hit a GCC bug
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
namespace rust {

template<>
struct IsRelocatable<QFontMetrics> : ::std::true_type
{
};

} // namespace rust
5 changes: 5 additions & 0 deletions crates/cxx-qt-lib-headers/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ pub fn build_opts() -> cxx_qt_build::CxxQtBuildersOpts {
#[cfg(feature = "qt_gui")]
(include_str!("../include/gui/qfont.h"), "qfont.h"),
#[cfg(feature = "qt_gui")]
(
include_str!("../include/gui/qfontmetrics.h"),
"qfontmetrics.h",
),
#[cfg(feature = "qt_gui")]
(
include_str!("../include/gui/qguiapplication.h"),
"qguiapplication.h",
Expand Down
2 changes: 2 additions & 0 deletions crates/cxx-qt-lib/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ fn main() {
"core/qvector/qvector_qcolor",
"gui/qcolor",
"gui/qfont",
"gui/qfontmetrics",
"gui/qguiapplication",
"gui/qimage",
"gui/qpainterpath",
Expand Down Expand Up @@ -201,6 +202,7 @@ fn main() {
cpp_files.extend([
"gui/qcolor",
"gui/qfont",
"gui/qfontmetrics",
"gui/qguiapplication",
"gui/qimage",
"gui/qpainterpath",
Expand Down
3 changes: 3 additions & 0 deletions crates/cxx-qt-lib/src/gui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ pub use qfont::{
QFontStyleHint, QFontStyleStrategy,
};

mod qfontmetrics;
pub use qfontmetrics::QFontMetrics;

mod qpainterpath;
pub use qpainterpath::QPainterPath;

Expand Down
22 changes: 22 additions & 0 deletions crates/cxx-qt-lib/src/gui/qfontmetrics.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// clang-format off
// SPDX-FileCopyrightText: 2024 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
// clang-format on
// SPDX-FileContributor: Laurent Montel <laurent.montel@kdab.com>
//
// SPDX-License-Identifier: MIT OR Apache-2.0

#include "cxx-qt-lib/qfontmetrics.h"

#include "../assertion_utils.h"

// https://code.qt.io/cgit/qt/qtbase.git/tree/src/gui/text/qfontmetrics.h?h=v5.15.6-lts-lgpl#n147
// https://code.qt.io/cgit/qt/qtbase.git/tree/src/gui/text/qfontmetrics.h?h=v6.2.4#n117
assert_alignment_and_size(QFontMetrics,
alignof(::std::size_t),
sizeof(::std::size_t));

static_assert(!::std::is_trivially_copy_assignable<QFontMetrics>::value);
static_assert(!::std::is_trivially_copy_constructible<QFontMetrics>::value);

static_assert(!::std::is_trivially_destructible<QFontMetrics>::value);
static_assert(QTypeInfo<QFontMetrics>::isRelocatable);
129 changes: 129 additions & 0 deletions crates/cxx-qt-lib/src/gui/qfontmetrics.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
// SPDX-FileCopyrightText: 2024 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
// SPDX-FileContributor: Laurent Montel <laurent.montel@kdab.com>
//
// SPDX-License-Identifier: MIT OR Apache-2.0
use cxx::{type_id, ExternType};
use std::mem::MaybeUninit;

#[cxx::bridge]
mod ffi {
unsafe extern "C++" {
include!("cxx-qt-lib/qfontmetrics.h");
type QFontMetrics = super::QFontMetrics;
include!("cxx-qt-lib/qrect.h");
type QRect = crate::QRect;
include!("cxx-qt-lib/qstring.h");
type QString = crate::QString;

/// Returns the ascent of the font.
fn ascent(self: &QFontMetrics) -> i32;

/// Returns the average width of glyphs in the font.
#[rust_name = "average_char_width"]
fn averageCharWidth(self: &QFontMetrics) -> i32;

/// Returns the bounding rectangle of the characters in the string specified by text.
/// The bounding rectangle always covers at least the set of pixels the text would cover if drawn at (0, 0).
#[rust_name = "bounding_rect"]
fn boundingRect(self: &QFontMetrics, text: &QString) -> QRect;

/// Returns the cap height of the font.
/// The cap height of a font is the height of a capital letter above the baseline. It specifically is
/// the height of capital letters that are flat - such as H or I - as opposed to round letters such
/// as O, or pointed letters like A, both of which may display overshoot.
#[rust_name = "cap_height"]
fn capHeight(self: &QFontMetrics) -> i32;

/// Returns the descent of the font.
/// The descent is the distance from the base line to the lowest point characters extend to. In practice,
/// some font designers break this rule, e.g. to accommodate a certain character,
/// so it is possible (though rare) that this value will be too small.
fn descent(self: &QFontMetrics) -> i32;

/// Returns the height of the font.
fn height(self: &QFontMetrics) -> i32;

/// Returns the leading of the font.
fn leading(self: &QFontMetrics) -> i32;

/// Returns the distance from one base line to the next.
/// This value is always equal to leading()+height().
#[rust_name = "line_spacing"]
fn lineSpacing(self: &QFontMetrics) -> i32;

/// Returns the width of the underline and strikeout lines, adjusted for the point size of the font.
#[rust_name = "line_width"]
fn lineWidth(self: &QFontMetrics) -> i32;

/// Returns the width of the widest character in the font.
#[rust_name = "max_width"]
fn maxWidth(self: &QFontMetrics) -> i32;

/// Returns the minimum left bearing of the font.
#[rust_name = "min_left_bearing"]
fn minLeftBearing(self: &QFontMetrics) -> i32;

/// Returns the minimum right bearing of the font.
#[rust_name = "min_right_bearing"]
fn minRightBearing(self: &QFontMetrics) -> i32;

/// Returns the distance from the base line to where an overline should be drawn.
#[rust_name = "overline_position"]
fn overlinePos(self: &QFontMetrics) -> i32;

/// Returns the distance from the base line to where the strikeout line should be drawn.
#[rust_name = "strike_out_position"]
fn strikeOutPos(self: &QFontMetrics) -> i32;

/// Returns a tight bounding rectangle around the characters in the string specified by text.
/// The bounding rectangle always covers at least the set of pixels the text would cover if drawn at (0, 0).
#[rust_name = "tight_bounding_rect"]
fn tightBoundingRect(self: &QFontMetrics, text: &QString) -> QRect;

/// Returns the distance from the base line to where an underscore should be drawn.
#[rust_name = "underline_position"]
fn underlinePos(self: &QFontMetrics) -> i32;

/// Returns the 'x' height of the font. This is often but not always the same as the height of the character 'x'.
#[rust_name = "x_height"]
fn xHeight(self: &QFontMetrics) -> i32;
}

#[namespace = "rust::cxxqtlib1"]
unsafe extern "C++" {
include!("cxx-qt-lib/common.h");

#[doc(hidden)]
#[rust_name = "qfontmetrics_drop"]
fn drop(fontmetics: &mut QFontMetrics);

#[doc(hidden)]
#[rust_name = "qfontmetrics_clone"]
fn construct(font: &QFontMetrics) -> QFontMetrics;
}
}

#[repr(C)]
pub struct QFontMetrics {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a test in the standalones would be good too :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will add it.

_cspec: MaybeUninit<i32>,
Montel marked this conversation as resolved.
Show resolved Hide resolved
}

impl Drop for QFontMetrics {
fn drop(&mut self) {
ffi::qfontmetrics_drop(self);
}
}

impl Clone for QFontMetrics {
fn clone(&self) -> Self {
ffi::qfontmetrics_clone(self)
}
}

// Safety:
//
// Static checks on the C++ side to ensure the size is the same.
unsafe impl ExternType for QFontMetrics {
type Id = type_id!("QFontMetrics");
type Kind = cxx::kind::Trivial;
}
16 changes: 16 additions & 0 deletions crates/cxx-qt-lib/src/gui/qpainter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ mod ffi {
type QPen = crate::QPen;
include!("cxx-qt-lib/qpolygon.h");
type QPolygon = crate::QPolygon;
include!("cxx-qt-lib/qfontmetrics.h");
type QFontMetrics = crate::QFontMetrics;

/// Returns the current background mode.
#[rust_name = "background_mode"]
Expand Down Expand Up @@ -286,6 +288,10 @@ mod ffi {
/// Returns the currently set font used for drawing text.
fn font(self: &QPainter) -> &QFont;

/// Returns the font metrics for the painter if the painter is active.
#[rust_name = "font_metrics_or_undefined"]
fn fontMetrics(self: &QPainter) -> QFontMetrics;

/// Returns true if clipping has been set; otherwise returns false.
#[rust_name = "has_clipping"]
fn hasClipping(self: &QPainter) -> bool;
Expand Down Expand Up @@ -415,4 +421,14 @@ impl QPainter {
None
}
}

/// Returns the bounding rectangle of the current clip if there is a clip;
/// otherwise returns `None`. Note that the clip region is given in logical coordinates.
pub fn font_metrics(&self) -> Option<ffi::QFontMetrics> {
if self.is_active() {
Some(self.font_metrics_or_undefined())
} else {
None
}
}
}
Loading