catmeow/looper
catmeow/looper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't scale cat larger than it is
Some checks failed
Build / build-gentoo (push) Failing after 15s
Details
Build / download-system-deps (push) Successful in 4m34s
Details
Build / get-source-code (push) Successful in 14m59s
Details
Build / build-deb (push) Failing after 5m15s
Details
Build / build-appimage (push) Successful in 4m41s
Details
Build / build-android (push) Failing after 3m15s
Details
Build / build-windows (push) Failing after 7m50s
Details

Browse source
This commit is contained in:
Zachary Hall 2025-01-21 12:48:19 -08:00
parent c1fe6cae2b
commit a53b2498cb
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backends/ui/haiku/image_view.cpp
View file

@ -41,6 +41,8 @@ void LImageView::Draw(BRect updateRect) {
mh = Bounds().Height(); mh = Bounds().Height();
float wr = ((float)mw) / ((float)bw); float wr = ((float)mw) / ((float)bw);
float hr = ((float)mh) / ((float)bh); float hr = ((float)mh) / ((float)bh);
if (wr > 1.0f) wr = 1.0f;
if (hr > 1.0f) hr = 1.0f;
if (wr < hr) { if (wr < hr) {
iw *= wr; iw *= wr;
ih *= wr; ih *= wr;

6
backends/ui/imgui/main.cpp
View file

@ -286,10 +286,12 @@ void MainLoop::GuiFunction() {
int cw, ch; int cw, ch;
SDL_QueryTexture(cat, NULL, NULL, &cw, &ch); SDL_QueryTexture(cat, NULL, NULL, &cw, &ch);
float aspect = ((float)cw) / ((float)ch); float aspect = ((float)cw) / ((float)ch);
float x_size = y_pos * aspect; float y_size = std::min(y_pos, (float)ch);
float x_size = y_size * aspect;
float x_pos = ImGui::GetWindowWidth() - ImGui::GetStyle().WindowPadding.x - x_size; float x_pos = ImGui::GetWindowWidth() - ImGui::GetStyle().WindowPadding.x - x_size;
ImGui::SetCursorPosX(x_pos); ImGui::SetCursorPosX(x_pos);
ImGui::Image((ImTextureID)cat, ImVec2(x_size, y_pos)); ImGui::SetCursorPosY(y_pos - y_size);
ImGui::Image((ImTextureID)cat, ImVec2(x_size, y_size));
} }
float centerSpace = ImGui::GetWindowHeight() - ImGui::GetFrameHeightWithSpacing() - ImGui::GetFrameHeight() - ImGui::GetStyle().WindowPadding.y; float centerSpace = ImGui::GetWindowHeight() - ImGui::GetFrameHeightWithSpacing() - ImGui::GetFrameHeight() - ImGui::GetStyle().WindowPadding.y;
if (streams.size() > 0) { if (streams.size() > 0) {

18
backends/ui/qt/main_window.cpp
View file

@ -194,5 +194,21 @@ void LooperWindow::clear_cat() {
} }
void LooperWindow::update_cat(QPixmap &img) { void LooperWindow::update_cat(QPixmap &img) {
cat_pixmap = &img; cat_pixmap = &img;
cat_disp->setPixmap(img.scaled(cat_disp->width(), cat_disp->height(), Qt::KeepAspectRatio)); int w = img.width();
int h = img.height();
int mw = cat_disp->width();
int mh = cat_disp->height();
float wr = ((float)mw) / ((float)w);
float hr = ((float)mh) / ((float)h);
if (wr > 1.0f) wr = 1.0f;
if (hr > 1.0f) hr = 1.0f;
if (wr > hr) {
mw *= wr;
mh *= wr;
} else {
mw *= hr;
mh *= hr;
}
cat_disp->setAlignment(Qt::AlignRight | Qt::AlignBottom);
cat_disp->setPixmap(img.scaled(mw, mh, Qt::KeepAspectRatio));
} }