View | Details | Raw Unified | Return to issue 108246
Collapse All | Expand All

(-)a/cui/source/options/optcolor.cxx (-12 / +26 lines)
Lines 252-257 Link Here
252
    virtual void    Command( const CommandEvent& rCEvt );
252
    virtual void    Command( const CommandEvent& rCEvt );
253
    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
253
    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
254
254
255
    // calculate position behind last chapter
256
    sal_Int32 impl_getPosBehindLastChapter() const;
257
255
public:
258
public:
256
    ColorConfigWindow_Impl(Window* pParent, const ResId& rResId);
259
    ColorConfigWindow_Impl(Window* pParent, const ResId& rResId);
257
    ~ColorConfigWindow_Impl();
260
    ~ColorConfigWindow_Impl();
Lines 389-395 Link Here
389
392
390
/* -----------------------------25.03.2002 17:05------------------------------
393
/* -----------------------------25.03.2002 17:05------------------------------
391
394
392
 ---------------------------------------------------------------------------*/
395
---------------------------------------------------------------------------*/
393
ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rResId) :
396
ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rResId) :
394
        Window(pParent, rResId),
397
        Window(pParent, rResId),
395
        aGeneralBackWN(this),
398
        aGeneralBackWN(this),
Lines 700-713 Link Here
700
    aChapters[GROUP_CALC    ]->SetGroupHeight( aChapters[GROUP_DRAW]->GetPosPixel().Y() -  aChapters[GROUP_CALC]->GetPosPixel().Y() );
703
    aChapters[GROUP_CALC    ]->SetGroupHeight( aChapters[GROUP_DRAW]->GetPosPixel().Y() -  aChapters[GROUP_CALC]->GetPosPixel().Y() );
701
    aChapters[GROUP_DRAW    ]->SetGroupHeight( aChapters[GROUP_BASIC]->GetPosPixel().Y() - aChapters[GROUP_DRAW]->GetPosPixel().Y() );
704
    aChapters[GROUP_DRAW    ]->SetGroupHeight( aChapters[GROUP_BASIC]->GetPosPixel().Y() - aChapters[GROUP_DRAW]->GetPosPixel().Y() );
702
	aChapters[GROUP_BASIC   ]->SetGroupHeight( aChapters[GROUP_SQL]->GetPosPixel().Y() - aChapters[GROUP_BASIC]->GetPosPixel().Y() );
705
	aChapters[GROUP_BASIC   ]->SetGroupHeight( aChapters[GROUP_SQL]->GetPosPixel().Y() - aChapters[GROUP_BASIC]->GetPosPixel().Y() );
706
    aChapters[GROUP_SQL]->SetGroupHeight(impl_getPosBehindLastChapter()
707
            - aChapters[GROUP_SQL]->GetPosPixel().Y());
703
708
704
    ExtendedColorConfig aExtConfig;
709
    ExtendedColorConfig aExtConfig;
705
	sal_Int32 nExtCount = aExtConfig.GetComponentCount();
710
	sal_Int32 nExtCount = aExtConfig.GetComponentCount();
706
	if ( nExtCount )
711
	if ( nExtCount )
707
	{
712
	{
708
        // calculate position behind last chapter
713
        const sal_Int32 nLastY(impl_getPosBehindLastChapter());
709
        sal_Int32 nLastY = aSQLCommentWN.GetPosPixel().Y() + aSQLCommentWN.GetSizePixel().Height();
710
        nLastY = nLastY + LogicToPixel( Size( 0, 3 ), MAP_APPFONT ).Height();
711
        // to calculate the number of lines
714
        // to calculate the number of lines
712
        sal_Int32 nHeight = LogicToPixel( Size( 0, _LINE_HEIGHT ), MAP_APPFONT ).Height();
715
        sal_Int32 nHeight = LogicToPixel( Size( 0, _LINE_HEIGHT ), MAP_APPFONT ).Height();
713
        sal_Int32 nLineNum = nLastY / nHeight;
716
        sal_Int32 nLineNum = nLastY / nHeight;
Lines 889-894 Link Here
889
	aChapterWins.clear();
892
	aChapterWins.clear();
890
	::std::vector< Window*>().swap(aChapterWins);
893
	::std::vector< Window*>().swap(aChapterWins);
891
}
894
}
895
896
sal_Int32
897
ColorConfigWindow_Impl::impl_getPosBehindLastChapter() const
898
{
899
    sal_Int32 nLastY = aSQLCommentWN.GetPosPixel().Y() + aSQLCommentWN.GetSizePixel().Height();
900
    nLastY = nLastY + LogicToPixel( Size( 0, 3 ), MAP_APPFONT ).Height();
901
    return nLastY;
902
}
903
892
/* -----------------------------2002/06/20 12:48------------------------------
904
/* -----------------------------2002/06/20 12:48------------------------------
893
905
894
 ---------------------------------------------------------------------------*/
906
 ---------------------------------------------------------------------------*/
Lines 1166-1174 Link Here
1166
/* -----------------------------26.03.2002 12:55------------------------------
1178
/* -----------------------------26.03.2002 12:55------------------------------
1167
1179
1168
 ---------------------------------------------------------------------------*/
1180
 ---------------------------------------------------------------------------*/
1169
sal_Bool lcl_MoveAndShow(Window* pWindow, long nOffset, long nMaxVisible, bool _bShow)
1181
sal_Bool lcl_MoveAndShow(Window* pWindow, long nOffset, long nMaxVisible, sal_Bool _bShow)
1170
{
1182
{
1171
    BOOL bHide = TRUE;
1183
    sal_Bool bHide = TRUE;
1172
    if(pWindow)
1184
    if(pWindow)
1173
    {
1185
    {
1174
        Point aPos = pWindow->GetPosPixel();
1186
        Point aPos = pWindow->GetPosPixel();
Lines 1197-1208 Link Here
1197
            continue;
1209
            continue;
1198
        Point aPos;
1210
        Point aPos;
1199
        //controls outside of the view need to be hidden to speed up accessibility tools
1211
        //controls outside of the view need to be hidden to speed up accessibility tools
1200
        bool bShowCtrl = ( lcl_isGroupVisible(
1212
        sal_Bool bShowCtrl = ( lcl_isGroupVisible(
1201
            lcl_getGroup(i), aScrollWindow.GetModuleOptions() ) != sal_False );
1213
            lcl_getGroup(i), aScrollWindow.GetModuleOptions() ) != sal_False );
1202
        lcl_MoveAndShow(aScrollWindow.aCheckBoxes[i], nOffset, nWindowHeight, bShowCtrl);
1214
        // if any of the items on the current line is visible, the
1203
        lcl_MoveAndShow(aScrollWindow.aFixedTexts[i], nOffset, nWindowHeight, bShowCtrl);
1215
        // whole line should be visible
1204
        lcl_MoveAndShow(aScrollWindow.aWindows[i]   , nOffset, nWindowHeight, bShowCtrl);
1216
        sal_Bool bShow(lcl_MoveAndShow(aScrollWindow.aCheckBoxes[i], nOffset, nWindowHeight, bShowCtrl));
1205
        BOOL bShow = lcl_MoveAndShow(aScrollWindow.aColorBoxes[i], nOffset, nWindowHeight, bShowCtrl);
1217
        bShow = lcl_MoveAndShow(aScrollWindow.aFixedTexts[i], nOffset, nWindowHeight, bShowCtrl) || bShow;
1218
        bShow = lcl_MoveAndShow(aScrollWindow.aWindows[i]   , nOffset, nWindowHeight, bShowCtrl) || bShow;
1219
        bShow = lcl_MoveAndShow(aScrollWindow.aColorBoxes[i], nOffset, nWindowHeight, bShowCtrl) || bShow;
1206
        if(bShow)
1220
        if(bShow)
1207
        {
1221
        {
1208
            if(nFirstVisible == -1)
1222
            if(nFirstVisible == -1)
Lines 1214-1220 Link Here
1214
    //show the one prior to the first visible and the first after the last visble control
1228
    //show the one prior to the first visible and the first after the last visble control
1215
    //to enable KEY_TAB travelling
1229
    //to enable KEY_TAB travelling
1216
1230
1217
    if(nFirstVisible)
1231
    if(nFirstVisible > 0)
1218
    {
1232
    {
1219
        //skip gaps where no controls exist for the related ColorConfigEntry
1233
        //skip gaps where no controls exist for the related ColorConfigEntry
1220
        do
1234
        do

Return to issue 108246