diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-08-19 18:17:30 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-08-22 14:26:31 +0200 |
| commit | 62fb135cde7bde7ff48acfdec5da3c88a2201998 (patch) | |
| tree | 8c9f03172ef5481e242d5c7fabfc25b15299b640 /cui | |
| parent | 3a8f89bc2fa6aea91ee6c17fa29eaa09575813d6 (diff) | |
Appearance dialog: fixed rendering of groups headings
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optcolor.cxx | 9 | ||||
| -rw-r--r-- | cui/source/options/optcolor.src | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index ca80a8c04e1f..bb7cd1506b4d 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -485,7 +485,7 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature ) ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rResId) : Window(pParent, rResId), aGeneralBackWN(this), - aGeneralFT(&aGeneralBackWN, ResId( FT_GENERAL, *rResId.GetResMgr() )), + aGeneralFT(this, ResId( FT_GENERAL, *rResId.GetResMgr() )), aDocColorFT(this, ResId( FT_DOCCOLOR, *rResId.GetResMgr())), aDocColorLB(this, ResId( LB_DOCCOLOR, *rResId.GetResMgr())), aDocColorWN(this, ResId( WN_DOCCOLOR, *rResId.GetResMgr())), @@ -870,8 +870,11 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe Font aFont = aChapters[i]->GetFont(); aFont.SetWeight(WEIGHT_BOLD); aChapters[i]->SetFont(aFont); - aChapters[i]->SetBackground(aTransparentWall); - aChapterWins[i]->SetPosSizePixel( Point(0, aChapters[i]->GetPosPixel().Y()), + aChapters[i]->SetBackground(Wallpaper(aBackColor)); + + long x = aChapters[i]->GetPosPixel().X() + aChapters[i]->GetSizePixel().Width(); + + aChapterWins[i]->SetPosSizePixel( Point(x, aChapters[i]->GetPosPixel().Y() ), Size(nWinWidth, nFTHeight)); aChapterWins[i]->SetBackground(Wallpaper(aBackColor)); aChapterWins[i]->Show(); diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index 284be8a6ed1e..e058e27cd60b 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -124,7 +124,7 @@ TabPage RID_SVXPAGE_COLORCONFIG #define POS_SIZE( POSX, LINENUM, CONTRL_SIZE ) Pos = MAP_APPFONT ( POSX , LINENUM * _LINE_HEIGHT ) ; CONTRL_SIZE // ... for special types -#define FT_SEP_POS_SIZE( LINENUM ) POS_SIZE( 14, LINENUM, FT_SEP_SIZE ) +#define FT_SEP_POS_SIZE( LINENUM ) POS_SIZE( 0, LINENUM, FT_SEP_SIZE ) #define FT_POS_SIZE( LINENUM ) POS_SIZE( _FT_XPOS, LINENUM, FT_SIZE ) #define LB_POS_SIZE( LINENUM ) POS_SIZE( _LB_XPOS, LINENUM, LB_SIZE ) #define WN_POS_SIZE( LINENUM ) POS_SIZE( _WN_XPOS, LINENUM, WN_SIZE ) |