From 07ba1aa3d0ba65a5a0c32dc778359a3c4debc20a Mon Sep 17 00:00:00 2001 From: Nimetu Date: Mon, 16 Sep 2019 23:31:13 +0300 Subject: [PATCH] Backed out changeset: 05b36f55a905 --HG-- branch : atys --- code/nel/include/nel/gui/css_style.h | 6 +++--- code/nel/src/gui/css_style.cpp | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/nel/include/nel/gui/css_style.h b/code/nel/include/nel/gui/css_style.h index 77dc2091a..0937ebe0b 100644 --- a/code/nel/include/nel/gui/css_style.h +++ b/code/nel/include/nel/gui/css_style.h @@ -167,11 +167,11 @@ namespace NLGUI return Current.FontSize-2; } - static sint styleStackIndex; + sint styleStackIndex = 0; inline void pushStyle() { - CCssStyle::styleStackIndex++; + styleStackIndex++; _StyleStack.push_back(Current); Current.DisplayBlock = false; @@ -186,7 +186,7 @@ namespace NLGUI inline void popStyle() { - CCssStyle::styleStackIndex--; + styleStackIndex--; if (_StyleStack.empty()) { Current = Root; diff --git a/code/nel/src/gui/css_style.cpp b/code/nel/src/gui/css_style.cpp index a8e60b011..b0b536d0d 100644 --- a/code/nel/src/gui/css_style.cpp +++ b/code/nel/src/gui/css_style.cpp @@ -31,8 +31,6 @@ using namespace NLMISC; namespace NLGUI { - sint CCssStyle::styleStackIndex = 0; - uint CCssStyle::SStyleRule::specificity() const { uint count = 0;