gridwin2.cxx (b3f79822) | gridwin2.cxx (51b45b88) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 123 unchanged lines hidden (view full) --- 132 133 aDiffPix -= aScrPos; 134 sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); 135 if ( bLayoutRTL ) 136 aDiffPix.X() = -aDiffPix.X(); 137 138 long nSizeX, nSizeY; 139 pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY ); | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 123 unchanged lines hidden (view full) --- 132 133 aDiffPix -= aScrPos; 134 sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); 135 if ( bLayoutRTL ) 136 aDiffPix.X() = -aDiffPix.X(); 137 138 long nSizeX, nSizeY; 139 pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY ); |
140 // The button height should not use the merged cell height, should still use single row height 141 nSizeY = pViewData->ToPixel(pDoc->GetRowHeight(nRow, nTab), pViewData->GetPPTY()); |
|
140 Size aScrSize(nSizeX-1, nSizeY-1); 141 142 // Check if the mouse cursor is clicking on the popup arrow box. 143 mpFilterButton.reset(new ScDPFieldButton(this, &GetSettings().GetStyleSettings(), &pViewData->GetZoomX(), &pViewData->GetZoomY(), pDoc)); 144 mpFilterButton->setBoundingBox(aScrPos, aScrSize, bLayoutRTL); 145 mpFilterButton->setPopupLeft(bLayoutRTL); // #i114944# AutoFilter button is left-aligned in RTL 146 Point aPopupPos; 147 Size aPopupSize; --- 926 unchanged lines hidden --- | 142 Size aScrSize(nSizeX-1, nSizeY-1); 143 144 // Check if the mouse cursor is clicking on the popup arrow box. 145 mpFilterButton.reset(new ScDPFieldButton(this, &GetSettings().GetStyleSettings(), &pViewData->GetZoomX(), &pViewData->GetZoomY(), pDoc)); 146 mpFilterButton->setBoundingBox(aScrPos, aScrSize, bLayoutRTL); 147 mpFilterButton->setPopupLeft(bLayoutRTL); // #i114944# AutoFilter button is left-aligned in RTL 148 Point aPopupPos; 149 Size aPopupSize; --- 926 unchanged lines hidden --- |