fix: fix mess with rebase

mehah · Jun 28, 2024 · 09309d3 · 09309d3
1 parent f8db2f8
commit 09309d3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 32 deletions.
diff --git a/modules/client_options/general.otui b/modules/client_options/general.otui
@@ -65,28 +65,6 @@ Panel
       id: showRightExtraPanel
       !text: tr('Show an extra right panel')
 
-  SmallReversedQtPanel
-    anchors.left: parent.left
-    anchors.right: parent.right
-    anchors.top: prev.bottom
-    margin-top: 7
-    height: 22
-
-    OptionCheckBox
-      id: showActionbar
-      !text: tr('Show action bar')
-
-  SmallReversedQtPanel
-    anchors.left: parent.left
-    anchors.right: parent.right
-    anchors.top: prev.bottom
-    margin-top: 7
-    height: 22
-
-    OptionCheckBox
-      id: showSpellGroupCooldowns
-      !text: tr('Show spell group cooldowns')
-
   SmallReversedQtPanel
     anchors.left: parent.left
     anchors.right: parent.right

diff --git a/modules/game_actionbar/game_actionbar.lua b/modules/game_actionbar/game_actionbar.lua
@@ -216,16 +216,6 @@ function setupActionBar()
     end
 end
 
-function setActionBarVisible(visible)
-    if visible then
-        actionBar:setHeight(34)
-        actionBar:show()
-    else
-        actionBar:setHeight(0)
-        actionBar:hide()
-    end
-end
-
 function createMenu(slotId)
     local menu = g_ui.createWidget('PopupMenu')
     slotToEdit = slotId