Kaydet (Commit) 92a8be9f authored tarafından Markus Mohrhard's avatar Markus Mohrhard

UI does not update correctly for icon sets, fdo#58308

Change-Id: Iceeab1ea3624fbefa8cb626899262e857b445ac1
üst 2f0bc524
...@@ -1354,9 +1354,13 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl ) ...@@ -1354,9 +1354,13 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl )
Point aPos = maEntries[0].GetPosPixel(); Point aPos = maEntries[0].GetPosPixel();
aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2; aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2;
maEntries[i].SetPosPixel( aPos ); maEntries[i].SetPosPixel( aPos );
maEntries[i].Show();
} }
maEntries.back().SetLastEntry(); maEntries.back().SetLastEntry();
SetHeight();
static_cast<ScCondFormatList*>(GetParent())->RecalcAll();
return 0; return 0;
} }
......
...@@ -78,7 +78,6 @@ private: ...@@ -78,7 +78,6 @@ private:
ScAddress maPos; ScAddress maPos;
ScRangeList maRanges; ScRangeList maRanges;
void RecalcAll();
void DoScroll(long nDiff); void DoScroll(long nDiff);
public: public:
...@@ -86,6 +85,7 @@ public: ...@@ -86,6 +85,7 @@ public:
const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType);
ScConditionalFormat* GetConditionalFormat() const; ScConditionalFormat* GetConditionalFormat() const;
void RecalcAll();
DECL_LINK( AddBtnHdl, void* ); DECL_LINK( AddBtnHdl, void* );
DECL_LINK( RemoveBtnHdl, void* ); DECL_LINK( RemoveBtnHdl, void* );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment