hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2024-12-31 00:49:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

label: add text_align option for multi-line text (#278)

Browse source
This commit is contained in:
bvr-yr 2024-04-13 16:38:06 +03:00 committed by GitHub
parent 6fa65e1172
commit 04267a5f83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nix/hm-module.nix
View file

@ -561,6 +561,12 @@ in {
default = "Hi there, $USER";
};
text_align = mkOption {
description = "Horizontal alignment of multi-line text";
type = str;
default = "";
};
color = mkOption {
description = "Color of the label";
type = str;
@ -729,6 +735,7 @@ in {
label {
monitor = ${label.monitor}
text = ${label.text}
text_align = ${label.text_align}
color = ${label.color}
font_size = ${toString label.font_size}
font_family = ${label.font_family}

2
src/config/ConfigManager.cpp
View file

@ -132,6 +132,7 @@ void CConfigManager::init() {
m_config.addSpecialConfigValue("label", "halign", Hyprlang::STRING{"none"});
m_config.addSpecialConfigValue("label", "valign", Hyprlang::STRING{"none"});
m_config.addSpecialConfigValue("label", "rotate", Hyprlang::FLOAT{0});
m_config.addSpecialConfigValue("label", "text_align", Hyprlang::STRING{""});
SHADOWABLE("label");
m_config.registerHandler(&::handleSource, "source", {false});
@ -288,6 +289,7 @@ std::vector<CConfigManager::SWidgetConfig> CConfigManager::getWidgetConfigs() {
{"halign", m_config.getSpecialConfigValue("label", "halign", k.c_str())},
{"valign", m_config.getSpecialConfigValue("label", "valign", k.c_str())},
{"rotate", m_config.getSpecialConfigValue("label", "rotate", k.c_str())},
{"text_align", m_config.getSpecialConfigValue("label", "text_align", k.c_str())},
SHADOWABLE("label"),
}
});

11
src/renderer/AsyncResourceGatherer.cpp
View file

@ -244,6 +244,17 @@ void CAsyncResourceGatherer::renderText(const SPreloadRequest& rq) {
pango_layout_set_font_description(layout, fontDesc);
pango_font_description_free(fontDesc);
if (rq.props.contains("text_align")) {
const std::string TEXTALIGN = std::any_cast<std::string>(rq.props.at("text_align"));
PangoAlignment align = PANGO_ALIGN_LEFT;
if (TEXTALIGN == "center")
align = PANGO_ALIGN_CENTER;
else if (TEXTALIGN == "right")
align = PANGO_ALIGN_RIGHT;
pango_layout_set_alignment(layout, align);
}
PangoAttrList* attrList = nullptr;
GError* gError = nullptr;
char* buf = nullptr;

4
src/renderer/widgets/Label.cpp
View file

@ -61,6 +61,7 @@ void CLabel::plantTimer() {
CLabel::CLabel(const Vector2D& viewport_, const std::unordered_map<std::string, std::any>& props, const std::string& output) :
outputStringPort(output), shadow(this, props, viewport_) {
labelPreFormat = std::any_cast<Hyprlang::STRING>(props.at("text"));
std::string textAlign = std::any_cast<Hyprlang::STRING>(props.at("text_align"));
std::string fontFamily = std::any_cast<Hyprlang::STRING>(props.at("font_family"));
CColor labelColor = std::any_cast<Hyprlang::INT>(props.at("color"));
int fontSize = std::any_cast<Hyprlang::INT>(props.at("font_size"));
@ -76,6 +77,9 @@ CLabel::CLabel(const Vector2D& viewport_, const std::unordered_map<std::string,
request.props["font_size"] = fontSize;
request.props["cmd"] = label.cmd;
if (!textAlign.empty())
request.props["text_align"] = textAlign;
g_pRenderer->asyncResourceGatherer->requestAsyncAssetPreload(request);
auto POS__ = std::any_cast<Hyprlang::VEC2>(props.at("position"));