Browse Source

Rename setRelPos to setScrollPos

kiwec 2 months ago
parent
commit
ffaedd176d

+ 2 - 2
src/App/Osu/Changelog.cpp

@@ -378,7 +378,7 @@ void Changelog::updateLayout() {
         changelog.title->setSizeToContent();
 
         yCounter += changelog.title->getSize().y;
-        changelog.title->setRelPos(15 * dpiScale, yCounter);
+        changelog.title->setScrollPos(15 * dpiScale, yCounter);
         /// yCounter += 10 * dpiScale;
 
         for(CBaseUIButton *change : changelog.changes) {
@@ -386,7 +386,7 @@ void Changelog::updateLayout() {
             change->setSizeToContent();
             change->setSizeY(change->getSize().y * 2.0f);
             yCounter += change->getSize().y /* + 13 * dpiScale*/;
-            change->setRelPos(35 * dpiScale, yCounter);
+            change->setScrollPos(35 * dpiScale, yCounter);
         }
 
         // gap to previous version

+ 1 - 1
src/App/Osu/Chat.cpp

@@ -868,7 +868,7 @@ void Chat::updateButtonLayout(Vector2 screen) {
 
     std::sort(m_channels.begin(), m_channels.end(), [](ChatChannel *a, ChatChannel *b) { return a->name < b->name; });
 
-    // Look, I really tried. But for some reason setRelPos() doesn't work until we change
+    // Look, I really tried. But for some reason setPos() doesn't work until we change
     // the screen resolution once. So I'll just compute absolute position manually.
     float button_container_height = button_height + 2;
     for(auto chan : m_channels) {

+ 4 - 4
src/App/Osu/MainMenu.cpp

@@ -1165,11 +1165,11 @@ void MainMenu::updateLayout() {
     const float size = Osu::getUIScale(324.0f);
     m_vSize = Vector2(size, size);
 
-    m_cube->setRelPos(m_vCenter - m_vSize / 2.0f - Vector2(m_fCenterOffsetAnim, 0.0f));
+    m_cube->setScrollPos(m_vCenter - m_vSize / 2.0f - Vector2(m_fCenterOffsetAnim, 0.0f));
     m_cube->setSize(m_vSize);
 
     m_pauseButton->setSize(30 * dpiScale, 30 * dpiScale);
-    m_pauseButton->setRelPos(osu->getScreenWidth() - m_pauseButton->getSize().x * 2 - 10 * dpiScale,
+    m_pauseButton->setScrollPos(osu->getScreenWidth() - m_pauseButton->getSize().x * 2 - 10 * dpiScale,
                              m_pauseButton->getSize().y + 10 * dpiScale);
 
     if(m_updateAvailableButton != NULL) {
@@ -1180,7 +1180,7 @@ void MainMenu::updateLayout() {
 
     m_versionButton->onResized();  // HACKHACK: framework, setSizeToContent() does not update string metrics
     m_versionButton->setSizeToContent(8 * dpiScale, 8 * dpiScale);
-    m_versionButton->setRelPos(-1, osu->getScreenSize().y - m_versionButton->getSize().y);
+    m_versionButton->setScrollPos(-1, osu->getScreenSize().y - m_versionButton->getSize().y);
 
     int numButtons = m_menuElements.size();
     int menuElementHeight = m_vSize.y / numButtons;
@@ -1195,7 +1195,7 @@ void MainMenu::updateLayout() {
         curY += (i > 0 ? menuElementHeight + menuElementPadding : 0.0f);
 
         m_menuElements[i]->onResized();  // HACKHACK: framework, setSize() does not update string metrics
-        m_menuElements[i]->setRelPos(m_cube->getRelPos().x + m_cube->getSize().x * offsetPercent -
+        m_menuElements[i]->setScrollPos(m_cube->getRelPos().x + m_cube->getSize().x * offsetPercent -
                                          menuElementExtraWidth * offsetPercent +
                                          menuElementExtraWidth * (1.0f - offsetPercent),
                                      curY);

+ 2 - 2
src/App/Osu/ModSelector.cpp

@@ -970,7 +970,7 @@ void ModSelector::updateExperimentalLayout() {
     int experimentalOffsetY = 6 * dpiScale;
     for(int i = 0; i < m_experimentalMods.size(); i++) {
         CBaseUIElement *e = m_experimentalMods[i].element;
-        e->setRelPosY(yCounter);
+        e->setScrollPosY(yCounter);
         e->setSizeY(e->getRelSize().y * dpiScale);
 
         // custom
@@ -1003,7 +1003,7 @@ void ModSelector::updateExperimentalLayout() {
 
     for(int i = 0; i < m_experimentalMods.size(); i++) {
         CBaseUIElement *e = m_experimentalMods[i].element;
-        e->setRelPosY(yCounter);
+        e->setScrollPosY(yCounter);
 
         if(e->getSize().x > experimentalMaxWidth) experimentalMaxWidth = e->getSize().x;
 

+ 24 - 24
src/App/Osu/OptionsMenu.cpp

@@ -1862,14 +1862,14 @@ void OptionsMenu::updateLayout() {
 
     const int categoriesWidth = optionsWidth * categoriesOptionsPercent;
 
-    m_options->setRelPosX((!m_bFullscreen ? -1 : osu->getScreenWidth() / 2 - (optionsWidth + categoriesWidth) / 2) +
+    m_options->setScrollPosX((!m_bFullscreen ? -1 : osu->getScreenWidth() / 2 - (optionsWidth + categoriesWidth) / 2) +
                           categoriesWidth);
     m_options->setSize(optionsWidth, osu->getScreenHeight() + 1);
 
-    m_search->setRelPos(m_options->getRelPos());
+    m_search->setScrollPos(m_options->getRelPos());
     m_search->setSize(m_options->getSize());
 
-    m_categories->setRelPosX(m_options->getRelPos().x - categoriesWidth);
+    m_categories->setScrollPosX(m_options->getRelPos().x - categoriesWidth);
     m_categories->setSize(categoriesWidth, osu->getScreenHeight() + 1);
 
     // reset
@@ -2024,8 +2024,8 @@ void OptionsMenu::updateLayout() {
         if(m_elements[i].resetButton != NULL) {
             CBaseUIButton *resetButton = m_elements[i].resetButton;
             resetButton->setSize(Vector2(35, 50) * dpiScale);
-            resetButton->setRelPosY(yCounter);
-            resetButton->setRelPosX(0);
+            resetButton->setScrollPosY(yCounter);
+            resetButton->setScrollPosX(0);
         }
 
         for(int j = 0; j < m_elements[i].elements.size(); j++) {
@@ -2059,8 +2059,8 @@ void OptionsMenu::updateLayout() {
             } else
                 e->setSizeX(elementWidth);
 
-            e->setRelPosX(sideMargin + sideMarginAdd);
-            e->setRelPosY(yCounter);
+            e->setScrollPosX(sideMargin + sideMarginAdd);
+            e->setScrollPosY(yCounter);
 
             yCounter += e->getSize().y;
         } else if(m_elements[i].elements.size() == 2 || isKeyBindButton) {
@@ -2087,22 +2087,22 @@ void OptionsMenu::updateLayout() {
                 const float dividerMiddle = 5.0f / 8.0f;
                 const float dividerEnd = 2.0f / 8.0f;
 
-                e1->setRelPos(sideMargin, yCounter);
+                e1->setScrollPos(sideMargin, yCounter);
                 e1->setSizeX(e1->getSize().y);
 
-                e2->setRelPos(sideMargin + e1->getSize().x + 0.5f * spacing, yCounter);
+                e2->setScrollPos(sideMargin + e1->getSize().x + 0.5f * spacing, yCounter);
                 e2->setSizeX(elementWidth * dividerMiddle - spacing);
 
-                e3->setRelPos(sideMargin + e1->getSize().x + e2->getSize().x + 1.5f * spacing, yCounter);
+                e3->setScrollPos(sideMargin + e1->getSize().x + e2->getSize().x + 1.5f * spacing, yCounter);
                 e3->setSizeX(elementWidth * dividerEnd - spacing);
             } else {
                 float dividerEnd = 1.0f / 2.0f;
                 float dividerBegin = 1.0f - dividerEnd;
 
-                e1->setRelPos(sideMargin + sideMarginAdd, yCounter);
+                e1->setScrollPos(sideMargin + sideMarginAdd, yCounter);
                 e1->setSizeX(elementWidth * dividerBegin - spacing);
 
-                e2->setRelPos(sideMargin + e1->getSize().x + 2 * spacing, yCounter);
+                e2->setScrollPos(sideMargin + e1->getSize().x + 2 * spacing, yCounter);
                 e2->setSizeX(elementWidth * dividerEnd - spacing);
             }
 
@@ -2129,9 +2129,9 @@ void OptionsMenu::updateLayout() {
                 e2->setSizeX(buttonSize);
                 e3->setSizeX(buttonSize);
 
-                e1->setRelPos(sideMargin, yCounter);
-                e2->setRelPos(e1->getRelPos().x + e1->getSize().x + buttonButtonLabelOffset, yCounter);
-                e3->setRelPos(e2->getRelPos().x + e2->getSize().x + buttonButtonLabelOffset, yCounter);
+                e1->setScrollPos(sideMargin, yCounter);
+                e2->setScrollPos(e1->getRelPos().x + e1->getSize().x + buttonButtonLabelOffset, yCounter);
+                e3->setScrollPos(e2->getRelPos().x + e2->getSize().x + buttonButtonLabelOffset, yCounter);
             } else {
                 const int labelSliderLabelOffset = 15 * dpiScale;
 
@@ -2163,12 +2163,12 @@ void OptionsMenu::updateLayout() {
                     sliderSize = 100;
                 }
 
-                e1->setRelPos(sideMargin + elementTextStartOffset, yCounter);
+                e1->setScrollPos(sideMargin + elementTextStartOffset, yCounter);
 
-                e2->setRelPos(e1->getRelPos().x + e1->getSize().x + labelSliderLabelOffset, yCounter);
+                e2->setScrollPos(e1->getRelPos().x + e1->getSize().x + labelSliderLabelOffset, yCounter);
                 e2->setSizeX(sliderSize - 2 * elementTextStartOffset - labelSliderLabelOffset * 2);
 
-                e3->setRelPos(e2->getRelPos().x + e2->getSize().x + labelSliderLabelOffset, yCounter);
+                e3->setScrollPos(e2->getRelPos().x + e2->getSize().x + labelSliderLabelOffset, yCounter);
             }
 
             yCounter += e2->getSize().y;
@@ -2206,7 +2206,7 @@ void OptionsMenu::updateLayout() {
     for(int i = 0; i < m_categoryButtons.size(); i++) {
         OptionsMenuCategoryButton *category = m_categoryButtons[i];
         category->onResized();  // HACKHACK: framework, setSize*() does not update string metrics
-        category->setRelPosY(categoryPaddingTopBottom + categoryHeight * i);
+        category->setScrollPosY(categoryPaddingTopBottom + categoryHeight * i);
         category->setSize(m_categories->getSize().x - 1, categoryHeight);
     }
     m_categories->getContainer()->update_pos();
@@ -2454,7 +2454,7 @@ void OptionsMenu::onSkinSelect() {
 
         if(m_bVisible) {
             m_contextMenu->setPos(m_skinSelectLocalButton->getPos());
-            m_contextMenu->setRelPos(m_skinSelectLocalButton->getRelPos());
+            m_contextMenu->setScrollPos(m_skinSelectLocalButton->getRelPos());
         } else {
             // Put it 50px from top, we'll move it later
             m_contextMenu->setPos(Vector2{0, 100});
@@ -2573,7 +2573,7 @@ void OptionsMenu::onResolutionSelect() {
 
     // build context menu
     m_contextMenu->setPos(m_resolutionSelectButton->getPos());
-    m_contextMenu->setRelPos(m_resolutionSelectButton->getRelPos());
+    m_contextMenu->setScrollPos(m_resolutionSelectButton->getRelPos());
     m_contextMenu->begin();
     for(int i = 0; i < resolutions.size(); i++) {
         if(resolutions[i].x > nativeResolution.x || resolutions[i].y > nativeResolution.y) continue;
@@ -2605,7 +2605,7 @@ void OptionsMenu::onOutputDeviceSelect() {
 
     // build context menu
     m_contextMenu->setPos(m_outputDeviceSelectButton->getPos());
-    m_contextMenu->setRelPos(m_outputDeviceSelectButton->getRelPos());
+    m_contextMenu->setScrollPos(m_outputDeviceSelectButton->getRelPos());
     m_contextMenu->begin();
     for(auto device : outputDevices) {
         CBaseUIButton *button = m_contextMenu->addButton(device.name);
@@ -2663,7 +2663,7 @@ void OptionsMenu::onCM360CalculatorLinkClicked() {
 void OptionsMenu::onNotelockSelect() {
     // build context menu
     m_contextMenu->setPos(m_notelockSelectButton->getPos());
-    m_contextMenu->setRelPos(m_notelockSelectButton->getRelPos());
+    m_contextMenu->setScrollPos(m_notelockSelectButton->getRelPos());
     m_contextMenu->begin(m_notelockSelectButton->getSize().x);
     {
         for(int i = 0; i < m_notelockTypes.size(); i++) {
@@ -2698,7 +2698,7 @@ void OptionsMenu::onNotelockSelectResetUpdate() {
 void OptionsMenu::onHPDrainSelect() {
     // build context menu
     m_contextMenu->setPos(m_hpDrainSelectButton->getPos());
-    m_contextMenu->setRelPos(m_hpDrainSelectButton->getRelPos());
+    m_contextMenu->setScrollPos(m_hpDrainSelectButton->getRelPos());
     m_contextMenu->begin(m_hpDrainSelectButton->getSize().x);
     {
         for(int i = 1; i < m_drainTypes.size(); i++) {

+ 5 - 5
src/App/Osu/RankingScreen.cpp

@@ -537,7 +537,7 @@ void RankingScreen::updateLayout() {
                              Osu::getImageScale(m_rankingTitle->getImage(), 75.0f) * uiScale);
     m_rankingTitle->setSize(m_rankingTitle->getImage()->getWidth() * m_rankingTitle->getScale().x,
                             m_rankingTitle->getImage()->getHeight() * m_rankingTitle->getScale().y);
-    m_rankingTitle->setRelPos(getSize().x - m_rankingTitle->getSize().x - osu->getUIScale(20.0f), 0);
+    m_rankingTitle->setScrollPos(getSize().x - m_rankingTitle->getSize().x - osu->getUIScale(20.0f), 0);
 
     m_songInfo->setSize(osu->getScreenWidth(),
                         max(m_songInfo->getMinimumHeight(),
@@ -552,7 +552,7 @@ void RankingScreen::updateLayout() {
                         osu->getScreenSize().y - (50 * uiScale * 2.f + 20.f * uiScale));
 
     m_rankings->setSize(osu->getScreenSize().x + 2, osu->getScreenSize().y - m_songInfo->getSize().y + 3);
-    m_rankings->setRelPosY(m_songInfo->getSize().y - 1);
+    m_rankings->setScrollPosY(m_songInfo->getSize().y - 1);
     update_pos();
 
     // NOTE: no uiScale for rankingPanel and rankingGrade, doesn't really work due to legacy layout expectations
@@ -568,10 +568,10 @@ void RankingScreen::updateLayout() {
 
     m_rankingIndex->setSize(m_rankings->getSize().x + 2, osu->getScreenHeight() * 0.07f * uiScale);
     m_rankingIndex->setBackgroundColor(0xff745e13);
-    m_rankingIndex->setRelPosY(m_rankings->getSize().y + 1);
+    m_rankingIndex->setScrollPosY(m_rankings->getSize().y + 1);
 
     m_rankingBottom->setSize(m_rankings->getSize().x + 2, osu->getScreenHeight() * 0.2f);
-    m_rankingBottom->setRelPosY(m_rankingIndex->getRelPos().y + m_rankingIndex->getSize().y);
+    m_rankingBottom->setScrollPosY(m_rankingIndex->getRelPos().y + m_rankingIndex->getSize().y);
 
     setGrade(m_grade);
 
@@ -628,7 +628,7 @@ void RankingScreen::setGrade(FinishedScore::Grade grade) {
     m_rankingGrade->setScale(rankingGradeImageScale, rankingGradeImageScale);
     m_rankingGrade->setSize(m_rankingGrade->getImage()->getWidth() * m_rankingGrade->getScale().x,
                             m_rankingGrade->getImage()->getHeight() * m_rankingGrade->getScale().y);
-    m_rankingGrade->setRelPos(m_rankings->getSize().x - osu->getUIScale(120) -
+    m_rankingGrade->setScrollPos(m_rankings->getSize().x - osu->getUIScale(120) -
                                   m_rankingGrade->getImage()->getWidth() * m_rankingGrade->getScale().x / 2.0f,
                               -m_rankings->getRelPos().y +
                                   osu->getUIScale(osu->getSkin()->getVersion() > 1.0f ? 200 : 170) -

+ 3 - 3
src/App/Osu/SongBrowser/Button.cpp

@@ -211,8 +211,8 @@ void Button::updateLayoutEx() {
         m_view->getSize().x -
             getActualSize().x * 0.15f);  // WARNING: hardcoded to match 0.85f above for buttonWidthCompensation
 
-    setRelPosX(offsetX);
-    setRelPosY(m_fTargetRelPosY + getSize().y * 0.125f * m_fHoverMoveAwayAnimation);
+    setScrollPosX(offsetX);
+    setScrollPosY(m_fTargetRelPosY + getSize().y * 0.125f * m_fHoverMoveAwayAnimation);
 }
 
 Button *Button::setVisible(bool visible) {
@@ -310,7 +310,7 @@ void Button::onMouseOutside() {
 
 void Button::setTargetRelPosY(float targetRelPosY) {
     m_fTargetRelPosY = targetRelPosY;
-    setRelPosY(m_fTargetRelPosY);
+    setScrollPosY(m_fTargetRelPosY);
 }
 
 Vector2 Button::getActualOffset() const {

+ 1 - 1
src/App/Osu/SongBrowser/CollectionButton.cpp

@@ -100,7 +100,7 @@ void CollectionButton::triggerContextMenu(Vector2 pos) {
 
     if(m_contextMenu != NULL) {
         m_contextMenu->setPos(pos);
-        m_contextMenu->setRelPos(pos);
+        m_contextMenu->setScrollPos(pos);
         m_contextMenu->begin(0, true);
         {
             m_contextMenu->addButton("[...]      Rename Collection", 1);

+ 1 - 1
src/App/Osu/SongBrowser/ScoreButton.cpp

@@ -511,7 +511,7 @@ void ScoreButton::onRightMouseUpInside() {
 
     if(m_contextMenu != NULL) {
         m_contextMenu->setPos(pos);
-        m_contextMenu->setRelPos(pos);
+        m_contextMenu->setScrollPos(pos);
         m_contextMenu->begin(0, true);
         {
             m_contextMenu->addButton("Use Mods", 1);  // for scores without mods this will just nomod

+ 24 - 24
src/App/Osu/SongBrowser/SongBrowser.cpp

@@ -2315,7 +2315,7 @@ void SongBrowser::updateLayout() {
                           max(osu->getSkin()->getSongSelectTop()->getHeight() * m_fSongSelectTopScale *
                                   osu_songbrowser_topbar_left_percent.getFloat(),
                               m_songInfo->getMinimumHeight() + margin));
-    m_songInfo->setRelPos(margin, margin);
+    m_songInfo->setScrollPos(margin, margin);
     m_songInfo->setSize(m_topbarLeft->getSize().x - margin,
                         max(m_topbarLeft->getSize().y * 0.75f, m_songInfo->getMinimumHeight() + margin));
 
@@ -2325,7 +2325,7 @@ void SongBrowser::updateLayout() {
     for(int i = 0; i < m_topbarLeftButtons.size(); i++) {
         m_topbarLeftButtons[i]->onResized();  // HACKHACK: framework bug (should update string metrics on setSize())
         m_topbarLeftButtons[i]->setSize(topbarLeftButtonWidth, topbarLeftButtonHeight);
-        m_topbarLeftButtons[i]->setRelPos(
+        m_topbarLeftButtons[i]->setScrollPos(
             m_topbarLeft->getSize().x - (i + 1) * (topbarLeftButtonMargin + topbarLeftButtonWidth),
             m_topbarLeft->getSize().y - m_topbarLeftButtons[i]->getSize().y);
     }
@@ -2337,7 +2337,7 @@ void SongBrowser::updateLayout() {
     for(int i = 0; i < m_topbarLeftTabButtons.size(); i++) {
         m_topbarLeftTabButtons[i]->onResized();  // HACKHACK: framework bug (should update string metrics on setSize())
         m_topbarLeftTabButtons[i]->setSize(topbarLeftTabButtonWidth, topbarLeftTabButtonHeight);
-        m_topbarLeftTabButtons[i]->setRelPos((topbarLeftTabButtonMargin + i * topbarLeftTabButtonWidth),
+        m_topbarLeftTabButtons[i]->setScrollPos((topbarLeftTabButtonMargin + i * topbarLeftTabButtonWidth),
                                              m_topbarLeft->getSize().y - m_topbarLeftTabButtons[i]->getSize().y);
     }
 
@@ -2358,7 +2358,7 @@ void SongBrowser::updateLayout() {
     for(int i = 0; i < m_topbarRightTabButtons.size(); i++) {
         m_topbarRightTabButtons[i]->onResized();  // HACKHACK: framework bug (should update string metrics on setSize())
         m_topbarRightTabButtons[i]->setSize(topbarRightTabButtonWidth, topbarRightTabButtonHeight);
-        m_topbarRightTabButtons[i]->setRelPos(
+        m_topbarRightTabButtons[i]->setScrollPos(
             m_topbarRight->getSize().x -
                 (topbarRightTabButtonMargin + (m_topbarRightTabButtons.size() - i) * topbarRightTabButtonWidth),
             m_topbarRight->getSize().y - m_topbarRightTabButtons[i]->getSize().y);
@@ -2367,7 +2367,7 @@ void SongBrowser::updateLayout() {
     if(m_topbarRightTabButtons.size() > 0) {
         m_groupLabel->onResized();  // HACKHACK: framework bug (should update string metrics on setSizeToContent())
         m_groupLabel->setSizeToContent(3 * dpiScale);
-        m_groupLabel->setRelPos(m_topbarRightTabButtons[0]->getRelPos() +
+        m_groupLabel->setScrollPos(m_topbarRightTabButtons[0]->getRelPos() +
                                 Vector2(-m_groupLabel->getSize().x, m_topbarRightTabButtons[0]->getSize().y / 2.0f -
                                                                         m_groupLabel->getSize().y / 2.0f));
     }
@@ -2379,14 +2379,14 @@ void SongBrowser::updateLayout() {
         0.0f, 200.0f * dpiScale);
     for(int i = 0; i < m_topbarRightSortButtons.size(); i++) {
         m_topbarRightSortButtons[i]->setSize(topbarRightSortButtonWidth, topbarRightSortButtonHeight);
-        m_topbarRightSortButtons[i]->setRelPos(
+        m_topbarRightSortButtons[i]->setScrollPos(
             m_topbarRight->getSize().x -
                 (topbarRightSortButtonMargin + (m_topbarRightTabButtons.size() - i) * topbarRightSortButtonWidth),
             topbarRightSortButtonMargin);
     }
     for(int i = 0; i < m_topbarRightGroupButtons.size(); i++) {
         m_topbarRightGroupButtons[i]->setSize(topbarRightSortButtonWidth, topbarRightSortButtonHeight);
-        m_topbarRightGroupButtons[i]->setRelPos(
+        m_topbarRightGroupButtons[i]->setScrollPos(
             m_topbarRight->getSize().x -
                 (topbarRightSortButtonMargin + (m_topbarRightTabButtons.size() - i) * topbarRightSortButtonWidth),
             topbarRightSortButtonMargin);
@@ -2395,7 +2395,7 @@ void SongBrowser::updateLayout() {
     if(m_topbarRightGroupButtons.size() > 0) {
         m_groupLabel->onResized();  // HACKHACK: framework bug (should update string metrics on setSizeToContent())
         m_groupLabel->setSizeToContent(3 * dpiScale);
-        m_groupLabel->setRelPos(
+        m_groupLabel->setScrollPos(
             m_topbarRightGroupButtons[m_topbarRightGroupButtons.size() - 1]->getRelPos() +
             Vector2(-m_groupLabel->getSize().x,
                     m_topbarRightGroupButtons[m_topbarRightGroupButtons.size() - 1]->getSize().y / 2.0f -
@@ -2404,7 +2404,7 @@ void SongBrowser::updateLayout() {
     if(m_topbarRightSortButtons.size() > 0) {
         m_sortLabel->onResized();  // HACKHACK: framework bug (should update string metrics on setSizeToContent())
         m_sortLabel->setSizeToContent(3 * dpiScale);
-        m_sortLabel->setRelPos(
+        m_sortLabel->setScrollPos(
             m_topbarRightSortButtons[m_topbarRightSortButtons.size() - 1]->getRelPos() +
             Vector2(-m_sortLabel->getSize().x,
                     m_topbarRightSortButtons[m_topbarRightSortButtons.size() - 1]->getSize().y / 2.0f -
@@ -2433,18 +2433,18 @@ void SongBrowser::updateLayout() {
 
         // new, hardcoded offsets instead of dynamically using the button skin image widths (except starting at 3rd
         // button)
-        m_bottombarNavButtons[i]->setRelPosX(
+        m_bottombarNavButtons[i]->setScrollPosX(
             navBarXCounter + gap + (i > 0 ? Osu::getUIScale(57.6f) : 0) +
             (i > 1 ? max((i - 1) * Osu::getUIScale(48.0f), m_bottombarNavButtons[i - 1]->getSize().x) : 0));
 
         // old, overflows with some skins (e.g. kyu)
-        // m_bottombarNavButtons[i]->setRelPosX((i == 0 ? navBarXCounter : 0) + gap + (i > 0 ?
+        // m_bottombarNavButtons[i]->setScrollPosX((i == 0 ? navBarXCounter : 0) + gap + (i > 0 ?
         // m_bottombarNavButtons[i-1]->getRelPos().x + m_bottombarNavButtons[i-1]->getSize().x : 0));
     }
 
     const int userButtonHeight = m_bottombar->getSize().y * 0.9f;
     m_userButton->setSize(userButtonHeight * 3.5f, userButtonHeight);
-    m_userButton->setRelPos(max(m_bottombar->getSize().x / 2 - m_userButton->getSize().x / 2,
+    m_userButton->setScrollPos(max(m_bottombar->getSize().x / 2 - m_userButton->getSize().x / 2,
                                 m_bottombarNavButtons[m_bottombarNavButtons.size() - 1]->getRelPos().x +
                                     m_bottombarNavButtons[m_bottombarNavButtons.size() - 1]->getSize().x + 10),
                             m_bottombar->getSize().y - m_userButton->getSize().y - 1);
@@ -2509,10 +2509,10 @@ void SongBrowser::updateScoreBrowserLayout() {
         m_localBestContainer->setPos(m_scoreBrowser->getPos().x,
                                      m_scoreBrowser->getPos().y + m_scoreBrowser->getSize().y);
         m_localBestContainer->setSize(m_scoreBrowser->getPos().x, local_best_size);
-        m_localBestLabel->setRelPos(m_scoreBrowser->getPos().x, 0);
+        m_localBestLabel->setScrollPos(m_scoreBrowser->getPos().x, 0);
         m_localBestLabel->setSize(m_scoreBrowser->getSize().x, 40);
         if(m_localBestButton) {
-            m_localBestButton->setRelPos(m_scoreBrowser->getPos().x, 40);
+            m_localBestButton->setScrollPos(m_scoreBrowser->getPos().x, 40);
             m_localBestButton->setSize(m_scoreBrowser->getSize().x, scoreHeight);
         }
     }
@@ -2521,19 +2521,19 @@ void SongBrowser::updateScoreBrowserLayout() {
     for(size_t i = 0; i < elements.size(); i++) {
         CBaseUIElement *scoreButton = elements[i];
         scoreButton->setSize(m_scoreBrowser->getSize().x, scoreHeight);
-        scoreButton->setRelPos(scoreBrowserExtraPaddingRight, i * scoreButton->getSize().y + 5 * dpiScale);
+        scoreButton->setScrollPos(scoreBrowserExtraPaddingRight, i * scoreButton->getSize().y + 5 * dpiScale);
     }
     m_scoreBrowserScoresStillLoadingElement->setSize(m_scoreBrowser->getSize().x * 0.9f, scoreHeight * 0.75f);
-    m_scoreBrowserScoresStillLoadingElement->setRelPos(
+    m_scoreBrowserScoresStillLoadingElement->setScrollPos(
         m_scoreBrowser->getSize().x / 2 - m_scoreBrowserScoresStillLoadingElement->getSize().x / 2,
         (browserHeight / 2) * 0.65f - m_scoreBrowserScoresStillLoadingElement->getSize().y / 2);
     m_scoreBrowserNoRecordsYetElement->setSize(m_scoreBrowser->getSize().x * 0.9f, scoreHeight * 0.75f);
     if(elements[0] == m_scoreBrowserNoRecordsYetElement) {
-        m_scoreBrowserNoRecordsYetElement->setRelPos(
+        m_scoreBrowserNoRecordsYetElement->setScrollPos(
             m_scoreBrowser->getSize().x / 2 - m_scoreBrowserScoresStillLoadingElement->getSize().x / 2,
             (browserHeight / 2) * 0.65f - m_scoreBrowserScoresStillLoadingElement->getSize().y / 2);
     } else {
-        m_scoreBrowserNoRecordsYetElement->setRelPos(
+        m_scoreBrowserNoRecordsYetElement->setScrollPos(
             m_scoreBrowser->getSize().x / 2 - m_scoreBrowserScoresStillLoadingElement->getSize().x / 2, 45);
     }
     m_localBestContainer->update_pos();
@@ -3095,7 +3095,7 @@ void SongBrowser::rebuildSongButtonsAndVisibleSongButtonsWithSearchMatchSupport(
 
 void SongBrowser::onSortScoresClicked(CBaseUIButton *button) {
     m_contextMenu->setPos(button->getPos());
-    m_contextMenu->setRelPos(button->getRelPos());
+    m_contextMenu->setScrollPos(button->getRelPos());
     m_contextMenu->begin(button->getSize().x);
     {
         CBaseUIButton *button = m_contextMenu->addButton("Online Leaderboard");
@@ -3144,7 +3144,7 @@ void SongBrowser::onWebClicked(CBaseUIButton *button) {
 
 void SongBrowser::onGroupClicked(CBaseUIButton *button) {
     m_contextMenu->setPos(button->getPos());
-    m_contextMenu->setRelPos(button->getRelPos());
+    m_contextMenu->setScrollPos(button->getRelPos());
     m_contextMenu->begin(button->getSize().x);
     {
         for(size_t i = 0; i < m_groupings.size(); i++) {
@@ -3219,7 +3219,7 @@ void SongBrowser::onGroupChange(UString text, int id) {
 
 void SongBrowser::onSortClicked(CBaseUIButton *button) {
     m_contextMenu->setPos(button->getPos());
-    m_contextMenu->setRelPos(button->getRelPos());
+    m_contextMenu->setScrollPos(button->getRelPos());
     m_contextMenu->begin(button->getSize().x);
     {
         for(size_t i = 0; i < m_sortingMethods.size(); i++) {
@@ -3235,7 +3235,7 @@ void SongBrowser::onSortClicked(CBaseUIButton *button) {
     // manual hack for small resolutions
     if(m_contextMenu->getRelPos().x + m_contextMenu->getSize().x > m_topbarRight->getSize().x) {
         int newRelPosX = m_topbarRight->getSize().x - m_contextMenu->getSize().x - 1;
-        m_contextMenu->setRelPosX(newRelPosX);
+        m_contextMenu->setScrollPosX(newRelPosX);
         m_contextMenu->setPosX(m_topbarRight->getPos().x + m_topbarRight->getSize().x - m_contextMenu->getSize().x - 1);
     }
 }
@@ -3463,7 +3463,7 @@ void SongBrowser::onAfterSortingOrGroupChangeUpdateInt(bool autoScroll) {
 
 void SongBrowser::onSelectionMode() {
     m_contextMenu->setPos(m_bottombarNavButtons[0]->getPos());
-    m_contextMenu->setRelPos(m_bottombarNavButtons[0]->getRelPos());
+    m_contextMenu->setScrollPos(m_bottombarNavButtons[0]->getRelPos());
     m_contextMenu->begin(0, true);
     {
         UIContextMenuButton *standardButton = m_contextMenu->addButton("Standard", 0);
@@ -3487,7 +3487,7 @@ void SongBrowser::onSelectionMode() {
     m_contextMenu->setPos(m_contextMenu->getPos() -
                           Vector2((m_contextMenu->getSize().x - m_bottombarNavButtons[0]->getSize().x) / 2.0f,
                                   m_contextMenu->getSize().y));
-    m_contextMenu->setRelPos(m_contextMenu->getRelPos() -
+    m_contextMenu->setScrollPos(m_contextMenu->getRelPos() -
                              Vector2((m_contextMenu->getSize().x - m_bottombarNavButtons[0]->getSize().x) / 2.0f,
                                      m_contextMenu->getSize().y));
     m_contextMenu->end(true, false);

+ 1 - 1
src/App/Osu/SongBrowser/SongButton.cpp

@@ -272,7 +272,7 @@ void SongButton::onRightMouseUpInside() { triggerContextMenu(engine->getMouse()-
 void SongButton::triggerContextMenu(Vector2 pos) {
     if(m_contextMenu != NULL) {
         m_contextMenu->setPos(pos);
-        m_contextMenu->setRelPos(pos);
+        m_contextMenu->setScrollPos(pos);
         m_contextMenu->begin(0, true);
         {
             if(m_databaseBeatmap != NULL && m_databaseBeatmap->getDifficulties().size() < 1)

+ 4 - 4
src/App/Osu/UIContextMenu.cpp

@@ -257,7 +257,7 @@ void UIContextMenu::end(bool invertAnimation, bool clampUnderflowAndOverflowAndE
             if(m_vPos.y < 0) {
                 const float underflow = std::abs(m_vPos.y);
 
-                setRelPosY(m_vPos.y + underflow);
+                setScrollPosY(m_vPos.y + underflow);
                 setPosY(m_vPos.y + underflow);
                 setSizeY(m_vSize.y - underflow);
 
@@ -295,7 +295,7 @@ void UIContextMenu::setVisible2(bool visible2) {
 void UIContextMenu::onResized() { setSize(m_vSize); }
 
 void UIContextMenu::onMoved() {
-    setRelPos(m_vPos);
+    setScrollPos(m_vPos);
     setPos(m_vPos);
 }
 
@@ -322,7 +322,7 @@ void UIContextMenu::onHitEnter(UIContextMenuTextbox *textbox) {
 void UIContextMenu::clampToBottomScreenEdge(UIContextMenu *menu) {
     if(menu->getRelPos().y + menu->getSize().y > osu->getScreenHeight()) {
         int newRelPosY = osu->getScreenHeight() - menu->getSize().y - 1;
-        menu->setRelPosY(newRelPosY);
+        menu->setScrollPosY(newRelPosY);
         menu->setPosY(newRelPosY);
     }
 }
@@ -330,7 +330,7 @@ void UIContextMenu::clampToBottomScreenEdge(UIContextMenu *menu) {
 void UIContextMenu::clampToRightScreenEdge(UIContextMenu *menu) {
     if(menu->getRelPos().x + menu->getSize().x > osu->getScreenWidth()) {
         const int newRelPosX = osu->getScreenWidth() - menu->getSize().x - 1;
-        menu->setRelPosX(newRelPosX);
+        menu->setScrollPosX(newRelPosX);
         menu->setPosX(newRelPosX);
     }
 }

+ 6 - 6
src/GUI/CBaseUIContainer.cpp

@@ -21,7 +21,7 @@ void CBaseUIContainer::empty() { m_vElements = std::vector<CBaseUIElement *>();
 CBaseUIContainer *CBaseUIContainer::addBaseUIElement(CBaseUIElement *element, float xPos, float yPos) {
     if(element == NULL) return this;
 
-    element->setRelPos(xPos, yPos);
+    element->setScrollPos(xPos, yPos);
     element->setPos(m_vPos + element->getRelPos());
     m_vElements.push_back(element);
 
@@ -31,7 +31,7 @@ CBaseUIContainer *CBaseUIContainer::addBaseUIElement(CBaseUIElement *element, fl
 CBaseUIContainer *CBaseUIContainer::addBaseUIElement(CBaseUIElement *element) {
     if(element == NULL) return this;
 
-    element->setRelPos(element->getPos().x, element->getPos().y);
+    element->setScrollPos(element->getPos().x, element->getPos().y);
     element->setPos(m_vPos + element->getRelPos());
     m_vElements.push_back(element);
 
@@ -41,7 +41,7 @@ CBaseUIContainer *CBaseUIContainer::addBaseUIElement(CBaseUIElement *element) {
 CBaseUIContainer *CBaseUIContainer::addBaseUIElementBack(CBaseUIElement *element, float xPos, float yPos) {
     if(element == NULL) return this;
 
-    element->setRelPos(xPos, yPos);
+    element->setScrollPos(xPos, yPos);
     element->setPos(m_vPos + element->getRelPos());
     m_vElements.insert(m_vElements.begin(), element);
 
@@ -51,7 +51,7 @@ CBaseUIContainer *CBaseUIContainer::addBaseUIElementBack(CBaseUIElement *element
 CBaseUIContainer *CBaseUIContainer::addBaseUIElementBack(CBaseUIElement *element) {
     if(element == NULL) return this;
 
-    element->setRelPos(element->getPos().x, element->getPos().y);
+    element->setScrollPos(element->getPos().x, element->getPos().y);
     element->setPos(m_vPos + element->getRelPos());
     m_vElements.insert(m_vElements.begin(), element);
 
@@ -61,7 +61,7 @@ CBaseUIContainer *CBaseUIContainer::addBaseUIElementBack(CBaseUIElement *element
 CBaseUIContainer *CBaseUIContainer::insertBaseUIElement(CBaseUIElement *element, CBaseUIElement *index) {
     if(element == NULL || index == NULL) return this;
 
-    element->setRelPos(element->getPos().x, element->getPos().y);
+    element->setScrollPos(element->getPos().x, element->getPos().y);
     element->setPos(m_vPos + element->getRelPos());
     for(size_t i = 0; i < m_vElements.size(); i++) {
         if(m_vElements[i] == index) {
@@ -78,7 +78,7 @@ CBaseUIContainer *CBaseUIContainer::insertBaseUIElement(CBaseUIElement *element,
 CBaseUIContainer *CBaseUIContainer::insertBaseUIElementBack(CBaseUIElement *element, CBaseUIElement *index) {
     if(element == NULL || index == NULL) return this;
 
-    element->setRelPos(element->getPos().x, element->getPos().y);
+    element->setScrollPos(element->getPos().x, element->getPos().y);
     element->setPos(m_vPos + element->getRelPos());
     for(size_t i = 0; i < m_vElements.size(); i++) {
         if(m_vElements[i] == index) {

+ 8 - 8
src/GUI/CBaseUIElement.h

@@ -62,7 +62,7 @@
         return this;                                             \
     }                                                            \
                                                                  \
-    virtual T *setRelPos(float xPos, float yPos) {               \
+    virtual T *setScrollPos(float xPos, float yPos) {               \
         if(m_vmPos.x != xPos || m_vmPos.y != yPos) {             \
             m_vmPos.x = xPos - m_vSize.x * m_vAnchor.x;          \
             m_vmPos.y = yPos - m_vSize.y * m_vAnchor.y;          \
@@ -70,21 +70,21 @@
         }                                                        \
         return this;                                             \
     }                                                            \
-    virtual T *setRelPosX(float xPos) {                          \
+    virtual T *setScrollPosX(float xPos) {                          \
         if(m_vmPos.x != xPos) {                                  \
             m_vmPos.x = xPos - m_vSize.x * m_vAnchor.x;          \
             updateLayout();                                      \
         }                                                        \
         return this;                                             \
     }                                                            \
-    virtual T *setRelPosY(float yPos) {                          \
+    virtual T *setScrollPosY(float yPos) {                          \
         if(m_vmPos.y != yPos) {                                  \
             m_vmPos.y = yPos - m_vSize.x * m_vAnchor.y;          \
             updateLayout();                                      \
         }                                                        \
         return this;                                             \
     }                                                            \
-    virtual T *setRelPos(Vector2 position) {                     \
+    virtual T *setScrollPos(Vector2 position) {                     \
         if(m_vmPos != position) {                                \
             m_vmPos = position - m_vSize * m_vAnchor;            \
             updateLayout();                                      \
@@ -92,7 +92,7 @@
         return this;                                             \
     }                                                            \
                                                                  \
-    virtual T *setRelPosAbsolute(float xPos, float yPos) {       \
+    virtual T *setScrollPosAbsolute(float xPos, float yPos) {       \
         if(m_vmPos.x != xPos || m_vmPos.y != yPos) {             \
             m_vmPos.x = xPos;                                    \
             m_vmPos.y = yPos;                                    \
@@ -100,21 +100,21 @@
         }                                                        \
         return this;                                             \
     }                                                            \
-    virtual T *setRelPosAbsoluteX(float xPos) {                  \
+    virtual T *setScrollPosAbsoluteX(float xPos) {                  \
         if(m_vmPos.x != xPos) {                                  \
             m_vmPos.x = xPos;                                    \
             updateLayout();                                      \
         }                                                        \
         return this;                                             \
     }                                                            \
-    virtual T *setRelPosAbsoluteY(float yPos) {                  \
+    virtual T *setScrollPosAbsoluteY(float yPos) {                  \
         if(m_vmPos.y != yPos) {                                  \
             m_vmPos.y = yPos;                                    \
             updateLayout();                                      \
         }                                                        \
         return this;                                             \
     }                                                            \
-    virtual T *setRelPosAbsolute(Vector2 position) {             \
+    virtual T *setScrollPosAbsolute(Vector2 position) {             \
         if(m_vmPos != position) {                                \
             m_vmPos = position;                                  \
             updateLayout();                                      \

+ 2 - 2
src/GUI/CBaseUIWindow.cpp

@@ -491,10 +491,10 @@ void CBaseUIWindow::onMouseUpOutside() {
 }
 
 void CBaseUIWindow::updateTitleBarMetrics() {
-    m_closeButton->setRelPos(
+    m_closeButton->setScrollPos(
         m_vSize.x - m_closeButton->getSize().x - (m_iTitleBarHeight - m_closeButton->getSize().x) / 2.0f,
         m_iTitleBarHeight / 2.0f - m_closeButton->getSize().y / 2.0f);
-    m_minimizeButton->setRelPos(
+    m_minimizeButton->setScrollPos(
         m_vSize.x - m_minimizeButton->getSize().x * 2 - (m_iTitleBarHeight - m_minimizeButton->getSize().x) / 2.0f - 6,
         m_iTitleBarHeight / 2.0f - m_minimizeButton->getSize().y / 2.0f);
 

+ 1 - 1
src/GUI/Windows/Console.cpp

@@ -263,7 +263,7 @@ void Console::onResized() {
     /// m_newLog->setSize(m_vSize.x - 2*CONSOLE_BORDER, m_vSize.y - getTitleBarHeight() - 2*CONSOLE_BORDER -
     /// m_textbox->getSize().y - 1);
     m_textbox->setSize(m_vSize.x - 2 * CONSOLE_BORDER, m_textbox->getSize().y);
-    m_textbox->setRelPosY(m_log->getRelPos().y + m_log->getSize().y + CONSOLE_BORDER + 1);
+    m_textbox->setScrollPosY(m_log->getRelPos().y + m_log->getSize().y + CONSOLE_BORDER + 1);
 
     m_log->scrollToY(m_log->getScrollPosY());
     // m_newLog->scrollY(m_newLog->getScrollPosY());

+ 8 - 8
src/GUI/Windows/VinylScratcher/VSControlBar.cpp

@@ -259,16 +259,16 @@ void VSControlBar::onDisabled() {
 }
 
 void VSControlBar::onResized() {
-    m_play->setRelPosX(m_vSize.x / 2 - m_play->getSize().x / 2);
-    m_prev->setRelPosX(m_play->getRelPos().x - m_prev->getSize().x);
-    m_next->setRelPosX(m_play->getRelPos().x + m_play->getSize().x);
-    m_info->setRelPosX(m_next->getRelPos().x + m_next->getSize().x);
+    m_play->setScrollPosX(m_vSize.x / 2 - m_play->getSize().x / 2);
+    m_prev->setScrollPosX(m_play->getRelPos().x - m_prev->getSize().x);
+    m_next->setScrollPosX(m_play->getRelPos().x + m_play->getSize().x);
+    m_info->setScrollPosX(m_next->getRelPos().x + m_next->getSize().x);
     m_volume->setSizeX(m_prev->getRelPos().x);
 
-    m_shuffle->setRelPosX(m_vSize.x - m_shuffle->getSize().x);
-    m_repeat->setRelPosX(m_vSize.x - 2 * m_repeat->getSize().x);
-    m_eq->setRelPos(m_vSize.x - 2 * m_eq->getSize().x, m_eq->getSize().y);
-    m_settings->setRelPos(m_vSize.x - m_settings->getSize().x, m_settings->getSize().y);
+    m_shuffle->setScrollPosX(m_vSize.x - m_shuffle->getSize().x);
+    m_repeat->setScrollPosX(m_vSize.x - 2 * m_repeat->getSize().x);
+    m_eq->setScrollPos(m_vSize.x - 2 * m_eq->getSize().x, m_eq->getSize().y);
+    m_settings->setScrollPos(m_vSize.x - m_settings->getSize().x, m_settings->getSize().y);
 
     m_info->setSizeX(m_repeat->getRelPos().x - (m_next->getRelPos().x + m_next->getSize().x) + 1);  // +1 fudge
 

+ 1 - 1
src/GUI/Windows/VinylScratcher/VinylScratcher.cpp

@@ -177,7 +177,7 @@ void VinylScratcher::onResized() {
 
     m_titleBar->setSizeX(m_vSize.x + 2);
     m_controlBar->setSizeX(m_vSize.x);
-    m_controlBar->setRelPosY(m_vSize.y - getTitleBarHeight() - m_controlBar->getSize().y);
+    m_controlBar->setScrollPosY(m_vSize.y - getTitleBarHeight() - m_controlBar->getSize().y);
     m_musicBrowser->setSize(m_vSize.x,
                             m_vSize.y - m_controlBar->getSize().y - m_titleBar->getSize().y - getTitleBarHeight());