Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Always use same default tabheader height (#9319)
Previously the default tabheader height was different when using
real coordinates. This resulted in the height of tabs changing when
switching tabs in sfinv if some tabs used real coordinates.
  • Loading branch information
p-ouellette committed May 9, 2020
1 parent 454dbf8 commit b624249
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/gui/guiFormSpecMenu.cpp
Expand Up @@ -2027,7 +2027,7 @@ void GUIFormSpecMenu::parseTabHeader(parserData* data, const std::string &elemen
// Width is not here because tabs are the width of the text, and
// there's no reason to change that.
unsigned int i = 0;
std::vector<std::string> v_geom = {"1", "0.75"}; // Dummy width and default height
std::vector<std::string> v_geom = {"1", "1"}; // Dummy width and height
bool auto_width = true;
if (parts.size() == 7) {
i++;
Expand Down Expand Up @@ -2071,6 +2071,9 @@ void GUIFormSpecMenu::parseTabHeader(parserData* data, const std::string &elemen
pos = getRealCoordinateBasePos(v_pos);

geom = getRealCoordinateGeometry(v_geom);
// Set default height
if (parts.size() <= 6)
geom.Y = m_btn_height * 2;
pos.Y -= geom.Y; // TabHeader base pos is the bottom, not the top.
if (auto_width)
geom.X = DesiredRect.getWidth(); // Set automatic width
Expand Down

0 comments on commit b624249

Please sign in to comment.