Skip to content

feat(dmenu): implement auto-height based on item count #985

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.

Sign up for GitHub

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

Open
Razuer wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −4
Open

feat(dmenu): implement auto-height based on item count #985

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 34 additions & 4 deletions vicinae/src/ipc-command-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "ui/dmenu-view/dmenu-view.hpp"
#include "utils.hpp"
#include "vicinae-ipc/ipc.hpp"
#include <algorithm>
#include <functional>
#include <glaze/core/common.hpp>
#include <glaze/core/reflect.hpp>
Expand Down Expand Up @@ -106,6 +107,11 @@ IpcCommandServer::IpcCommandServer(ApplicationContext *ctx, QWidget *parent)
m_rpc.route<ipc::DMenu>([](ipc::DMenu::Request request, Ctx ctx) {
using Watcher = QFutureWatcher<ipc::DMenu::Response>;
static constexpr const int DMENU_SMALL_WIDTH_THRESHOLD = 500;
static constexpr const int ITEM_HEIGHT = 41;
static constexpr const int SECTION_HEADER_HEIGHT = 30;
static constexpr const int MIN_ITEMS_SHOWN = 1;
static constexpr const int MAX_ITEMS_SHOWN = 12;

auto &m_ctx = *ctx.global->app;

auto &nav = m_ctx.navigation;
Expand Down Expand Up @@ -137,12 +143,36 @@ IpcCommandServer::IpcCommandServer(ApplicationContext *ctx, QWidget *parent)
nav->pushView(view);
nav->setInstantDismiss(true);

if (request.width || request.height) {
int w = request.width.value_or(cfg.launcherWindow.size.width);
int h = request.height.value_or(cfg.launcherWindow.size.height);
nav->requestWindowSize(QSize(w, h));
int w = request.width.value_or(cfg.launcherWindow.size.width);
int h;

if (request.height.has_value()) {
h = request.height.value();
} else {
int itemCount = std::ranges::count(request.rawContent, '\n');
if (!request.rawContent.empty() && request.rawContent.back() != '\n') itemCount++;

int clampedItems = std::clamp(itemCount, MIN_ITEMS_SHOWN, MAX_ITEMS_SHOWN);
bool hasSection = !request.noSection;
bool hasFooter = !request.noFooter;

// Calculate total height:
// Content = Header + (SectionHeader) + Items + Footer
// Margins = Window Borders (top+bottom) + VList Margins (top+bottom)

int contentHeight = cfg.header.height + (hasSection ? SECTION_HEADER_HEIGHT : 0) +
(clampedItems * ITEM_HEIGHT) + (hasFooter ? cfg.footer.height : 0);

int borderWidth = cfg.launcherWindow.clientSideDecorations.borderWidth;
int windowVerticalPadding = borderWidth * 2;
int listVerticalPadding = 10; // VListWidget::DEFAULT_MARGINS (5 top + 5 bottom)

h = contentHeight + windowVerticalPadding + listVerticalPadding +
1; // +1 to prevent scrollbar flickering
}

nav->requestWindowSize(QSize(w, h));

nav->showWindow();

return future;
Expand Down