From dfca728e584f6be65757df35e7828a298b6af63f Mon Sep 17 00:00:00 2001 From: Joakim Hunskaar <joakim.borge.hunskar@gmail.com> Date: Sun, 30 Jun 2024 20:03:33 +0200 Subject: [PATCH] rollback of getter dimensions because it breaks compability --- .../subprojects/animationwindow/include/AnimationWindow.h | 4 ++-- .../subprojects/animationwindow/src/AnimationWindow.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies/subprojects/animationwindow/include/AnimationWindow.h b/dependencies/subprojects/animationwindow/include/AnimationWindow.h index 89d692c..c9211b7 100644 --- a/dependencies/subprojects/animationwindow/include/AnimationWindow.h +++ b/dependencies/subprojects/animationwindow/include/AnimationWindow.h @@ -120,8 +120,8 @@ class AnimationWindow { void show_error_dialog(const std::string& message) const; // Getters for the window dimensions - int get_width() const; - int get_height() const; + int width() const; + int height() const; void setBackgroundColor(TDT4102::Color newBackgroundColor); diff --git a/dependencies/subprojects/animationwindow/src/AnimationWindow.cpp b/dependencies/subprojects/animationwindow/src/AnimationWindow.cpp index cea352b..9ab2568 100644 --- a/dependencies/subprojects/animationwindow/src/AnimationWindow.cpp +++ b/dependencies/subprojects/animationwindow/src/AnimationWindow.cpp @@ -337,11 +337,11 @@ TDT4102::Point TDT4102::AnimationWindow::getWindowDimensions() const { return dimensions; } -int TDT4102::AnimationWindow::get_width() const { +int TDT4102::AnimationWindow::width() const { return getWindowDimensions().x; } -int TDT4102::AnimationWindow::get_height() const { +int TDT4102::AnimationWindow::height() const { return getWindowDimensions().y; } -- GitLab