Skip to content

Use solid color for row/column header in Calc. #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pilot-Pirx merged 3 commits into from
Jan 27, 2026
Merged

Use solid color for row/column header in Calc. #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d362c36
Quick hack, clean up code later
Pilot-Pirx Jan 27, 2026
7cdaf10
Additional file
Pilot-Pirx Jan 27, 2026
797d3d6
Additional files
Pilot-Pirx Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions main/sc/source/ui/inc/hdrcont.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
*
*************************************************************/



#ifndef SC_HDRCONT_HXX
#define SC_HDRCONT_HXX

Expand All @@ -32,15 +30,12 @@

// ---------------------------------------------------------------------------


#define HDR_HORIZONTAL 0
#define HDR_VERTICAL 1

#define HDR_SIZE_OPTIMUM 0xFFFF


// Groesse des Sliders
#define HDR_SLIDERSIZE 2
#define HDR_SLIDERSIZE 2 // Groesse des Sliders

class ScHeaderControl : public Window
{
Expand All @@ -51,7 +46,7 @@ private:
sal_Bool bBoldSet;

sal_uInt16 nFlags;
sal_Bool bVertical; // Vertikal = Zeilenheader
sal_Bool bVertical; // Vertikal = Zeilenheader

long nWidth;
long nSmallWidth;
Expand All @@ -63,7 +58,7 @@ private:
SCCOLROW nMarkEnd;
sal_Bool bMarkRange;

sal_Bool bDragging; // Groessen aendern
sal_Bool bDragging; // Groessen aendern
SCCOLROW nDragNo;
long nDragStart;
long nDragPos;
Expand All @@ -73,15 +68,15 @@ private:

long GetScrPos( SCCOLROW nEntryNo );
SCCOLROW GetMousePos( const MouseEvent& rMEvt, sal_Bool& rBorder );
bool IsSelectionAllowed(SCCOLROW nPos) const;
bool IsSelectionAllowed(SCCOLROW nPos) const;
void ShowDragHelp();

void DoPaint( SCCOLROW nStart, SCCOLROW nEnd );

void DrawShadedRect( long nStart, long nEnd, const Color& rBaseColor );
void DrawShadedRect( long nStart, long nEnd, const Color& rBaseColor );

protected:
// von Window ueberladen
// von Window ueberladen

virtual void Paint( const Rectangle& rRect );

Expand All @@ -92,10 +87,10 @@ protected:

virtual void RequestHelp( const HelpEvent& rHEvt );

// neue Methoden
// new methods

virtual SCCOLROW GetPos() = 0; // aktuelle Position (Scrolling)
virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) = 0; // Breite / Hoehe (Pixel)
virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) = 0; // Width / Height (pixel)
virtual String GetEntryText( SCCOLROW nEntryNo ) = 0;

virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo );
Expand Down Expand Up @@ -131,6 +126,6 @@ public:
void SetWidth( long nNew );
};



#endif

/* vim: set noet sw=4 ts=4: */
80 changes: 38 additions & 42 deletions main/sc/source/ui/inc/tabview.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
*
*************************************************************/


#ifndef SC_TABVIEW_HXX
#define SC_TABVIEW_HXX

Expand Down Expand Up @@ -58,7 +57,7 @@ class SdrHdlList;

namespace com { namespace sun { namespace star {
namespace chart2 { namespace data {
struct HighlightedRange;
struct HighlightedRange;
}}}}}

#define SPLIT_HANDLE_SIZE 3
Expand All @@ -85,7 +84,6 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
};


// ---------------------------------------------------------------------------

class ScTabView
Expand All @@ -100,7 +98,7 @@ private:
ScHeaderSelectionEngine* pHdrSelEng;
ScHeaderFunctionSet aHdrFunc;

SfxInPlaceClient* pIPClient;
SfxInPlaceClient* pIPClient;

ScDrawView* pDrawView;

Expand Down Expand Up @@ -133,9 +131,9 @@ private:
ScPageBreakData* pPageBreakData; // fuer Seitenumbruch-Modus
ScHighlightRanges* pHighlightRanges;

ScDocument* pBrushDocument; // cell formats for format paint brush
SfxItemSet* pDrawBrushSet; // drawing object attributes for paint brush
sal_Bool bLockPaintBrush; // keep for more than one use?
ScDocument* pBrushDocument; // cell formats for format paint brush
SfxItemSet* pDrawBrushSet; // drawing object attributes for paint brush
sal_Bool bLockPaintBrush; // keep for more than one use?

Timer aScrollTimer;
ScGridWindow* pTimerWindow;
Expand All @@ -152,20 +150,20 @@ private:
sal_Bool bBlockRows; // werden ganze Zeilen markiert?

SCCOL nBlockStartX;
SCCOL nBlockStartXOrig;
SCCOL nBlockStartXOrig;
SCCOL nBlockEndX;

SCROW nBlockStartY;
SCROW nBlockStartYOrig;
SCROW nBlockStartYOrig;
SCROW nBlockEndY;

SCTAB nBlockStartZ;
SCTAB nBlockEndZ;

SCCOL nOldCurX;
SCROW nOldCurY;
SCCOL nOldCurX;
SCROW nOldCurY;

double mfPendingTabBarWidth; // Tab bar width relative to frame window width.
double mfPendingTabBarWidth; // Tab bar width relative to frame window width.

sal_Bool bMinimized;
sal_Bool bInUpdateHeader;
Expand All @@ -190,7 +188,7 @@ private:

void UpdateVarZoom();

void UpdateVisibleRange();
void UpdateVisibleRange();

static void SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, sal_Bool bLayoutRTL );
static long GetScrollBarPos( ScrollBar& rScroll, sal_Bool bLayoutRTL );
Expand Down Expand Up @@ -230,9 +228,8 @@ public:
void RemoveHintWindow();
void TestHintWindow();


DECL_LINK( TabBarResize, void* );
/** Sets an absolute tab bar width (in pixels). */
/** Sets an absolute tab bar width (in pixels). */
void SetTabBarWidth( long nNewWidth );
/** Sets a relative tab bar width.
@param fRelTabBarWidth Tab bar width relative to frame window width (0.0 ... 1.0). */
Expand Down Expand Up @@ -285,7 +282,7 @@ public:

sal_Bool IsMinimized() const { return bMinimized; }

// bSameTabButMoved = true if the same sheet as before is activated, used after moving/copying/inserting/deleting a sheet
// bSameTabButMoved = true if the same sheet as before is activated, used after moving/copying/inserting/deleting a sheet
void TabChanged( bool bSameTabButMoved = false );
void SetZoom( const Fraction& rNewX, const Fraction& rNewY, sal_Bool bAll );
SC_DLLPUBLIC void RefreshZoom();
Expand Down Expand Up @@ -337,8 +334,8 @@ public:

Point GetInsertPos();

Point GetChartInsertPos( const Size& rSize, const ScRange& rCellRange );
Point GetChartDialogPos( const Size& rDialogSize, const Rectangle& rLogicChart );
Point GetChartInsertPos( const Size& rSize, const ScRange& rCellRange );
Point GetChartDialogPos( const Size& rDialogSize, const Rectangle& rLogicChart );

void UpdateAutoFillMark();

Expand All @@ -350,13 +347,13 @@ public:
void AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
const ScSplitPos* pWhich = NULL );

SvxZoomType GetZoomType() const;
void SetZoomType( SvxZoomType eNew, sal_Bool bAll );
SvxZoomType GetZoomType() const;
void SetZoomType( SvxZoomType eNew, sal_Bool bAll );
sal_uInt16 CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom );

// void CalcZoom( SvxZoomType eType, sal_uInt16& rZoom, SCCOL& rCol, SCROW& rRow );

sal_Bool HasPageFieldDataAtCursor() const;
sal_Bool HasPageFieldDataAtCursor() const;
void StartDataSelect();

// MoveCursorAbs - absolut
Expand All @@ -380,15 +377,15 @@ public:

void MoveCursorEnter( sal_Bool bShift ); // Shift fuer Richtung (kein Markieren)

sal_Bool MoveCursorKeyInput( const KeyEvent& rKeyEvent );
sal_Bool MoveCursorKeyInput( const KeyEvent& rKeyEvent );

void FindNextUnprot( sal_Bool bShift, sal_Bool bInSelection = sal_True );

void SetNewStartIfMarking();

// bSameTabButMoved = true if the same sheet as before is activated, used after moving/copying/inserting/deleting a sheet
SC_DLLPUBLIC void SetTabNo( SCTAB nTab, sal_Bool bNew = sal_False, sal_Bool bExtendSelection = sal_False, bool bSameTabButMoved = false );
void SelectNextTab( short nDir, sal_Bool bExtendSelection = sal_False );
// bSameTabButMoved = true if the same sheet as before is activated, used after moving/copying/inserting/deleting a sheet
SC_DLLPUBLIC void SetTabNo( SCTAB nTab, sal_Bool bNew = sal_False, sal_Bool bExtendSelection = sal_False, bool bSameTabButMoved = false );
void SelectNextTab( short nDir, sal_Bool bExtendSelection = sal_False );

void ActivateView( sal_Bool bActivate, sal_Bool bFirst );
void ActivatePart( ScSplitPos eWhich );
Expand Down Expand Up @@ -434,9 +431,9 @@ public:

void CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress);

void UpdateSelectionOverlay();
void UpdateShrinkOverlay();
void UpdateAllOverlays();
void UpdateSelectionOverlay();
void UpdateShrinkOverlay();
void UpdateAllOverlays();

void UpdateFormulas();
void InterpretVisible();
Expand All @@ -461,12 +458,11 @@ public:
void KillEditView( sal_Bool bNoPaint );
void UpdateEditView();


// Bloecke

void SelectAll( sal_Bool bContinue = sal_False );
void SelectAllTables();
void DeselectAllTables();
void DeselectAllTables();

void MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
sal_Bool bCols = sal_False, sal_Bool bRows = sal_False, sal_Bool bCellSelection = sal_False );
Expand All @@ -484,15 +480,15 @@ public:
void MarkMatrixFormula();
void Unmark();

void MarkRange( const ScRange& rRange, sal_Bool bSetCursor = sal_True, sal_Bool bContinue = sal_False );
void MarkRange( const ScRange& rRange, sal_Bool bSetCursor = sal_True, sal_Bool bContinue = sal_False );

sal_Bool IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;

void PaintMarks( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
void PaintBlock( sal_Bool bReset = sal_False );

void SetMarkData( const ScMarkData& rNew );
void MarkDataChanged();
void SetMarkData( const ScMarkData& rNew );
void MarkDataChanged();

void LockModifiers( sal_uInt16 nModifiers );
sal_uInt16 GetLockedModifiers() const;
Expand All @@ -515,15 +511,15 @@ public:

Window* GetFrameWin() const { return pFrameWin; }

sal_Bool HasPaintBrush() const { return pBrushDocument || pDrawBrushSet; }
ScDocument* GetBrushDocument() const { return pBrushDocument; }
SfxItemSet* GetDrawBrushSet() const { return pDrawBrushSet; }
sal_Bool IsPaintBrushLocked() const { return bLockPaintBrush; }
void SetBrushDocument( ScDocument* pNew, sal_Bool bLock );
void SetDrawBrushSet( SfxItemSet* pNew, sal_Bool bLock );
void ResetBrushDocument();
sal_Bool HasPaintBrush() const { return pBrushDocument || pDrawBrushSet; }
ScDocument* GetBrushDocument() const { return pBrushDocument; }
SfxItemSet* GetDrawBrushSet() const { return pDrawBrushSet; }
sal_Bool IsPaintBrushLocked() const { return bLockPaintBrush; }
void SetBrushDocument( ScDocument* pNew, sal_Bool bLock );
void SetDrawBrushSet( SfxItemSet* pNew, sal_Bool bLock );
void ResetBrushDocument();
};



#endif

/* vim: set noet sw=4 ts=4: */
Loading