archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix missing header & footer toggle chevrons in Spreadsheet

Browse Source 
The little chevron tab to open a hidden region wouldn't show up in the
Spreadsheet editor. Cause was an incorrect GPU-scissor usage:
While drawing regions, the scissors should be kept enabled, just the
scissor rectangle should be updated - and afterwards reset to what it
was before.
This commit is contained in:
Julian Eisel
2021-05-04 20:20:15 +02:00
parent 87ee8ddfe3
commit 5ea113a555
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/space_spreadsheet/spreadsheet_draw.cc
View File

@@ -142,7 +142,9 @@ static void draw_left_column_content(const int scroll_offset_y,
ARegion *region, ARegion *region,
const SpreadsheetDrawer &drawer) const SpreadsheetDrawer &drawer)
{ {
GPU_scissor_test(true); int old_scissor[4];
GPU_scissor_get(old_scissor);
GPU_scissor(0, 0, drawer.left_column_width, region->winy - drawer.top_row_height); GPU_scissor(0, 0, drawer.left_column_width, region->winy - drawer.top_row_height);
uiBlock *left_column_block = UI_block_begin(C, region, __func__, UI_EMBOSS_NONE); uiBlock *left_column_block = UI_block_begin(C, region, __func__, UI_EMBOSS_NONE);
@@ -165,7 +167,7 @@ static void draw_left_column_content(const int scroll_offset_y,
UI_block_end(C, left_column_block); UI_block_end(C, left_column_block);
UI_block_draw(C, left_column_block); UI_block_draw(C, left_column_block);
GPU_scissor_test(false); GPU_scissor(UNPACK4(old_scissor));
} }
static void draw_top_row_content(const bContext *C, static void draw_top_row_content(const bContext *C,
@@ -173,7 +175,9 @@ static void draw_top_row_content(const bContext *C,
const SpreadsheetDrawer &drawer, const SpreadsheetDrawer &drawer,
const int scroll_offset_x) const int scroll_offset_x)
{ {
GPU_scissor_test(true); int old_scissor[4];
GPU_scissor_get(old_scissor);
GPU_scissor(drawer.left_column_width + 1, GPU_scissor(drawer.left_column_width + 1,
region->winy - drawer.top_row_height, region->winy - drawer.top_row_height,
region->winx - drawer.left_column_width, region->winx - drawer.left_column_width,
@@ -200,7 +204,7 @@ static void draw_top_row_content(const bContext *C,
UI_block_end(C, first_row_block); UI_block_end(C, first_row_block);
UI_block_draw(C, first_row_block); UI_block_draw(C, first_row_block);
GPU_scissor_test(false); GPU_scissor(UNPACK4(old_scissor));
} }
static void draw_cell_contents(const bContext *C, static void draw_cell_contents(const bContext *C,
@@ -209,7 +213,9 @@ static void draw_cell_contents(const bContext *C,
const int scroll_offset_x, const int scroll_offset_x,
const int scroll_offset_y) const int scroll_offset_y)
{ {
GPU_scissor_test(true); int old_scissor[4];
GPU_scissor_get(old_scissor);
GPU_scissor(drawer.left_column_width + 1, GPU_scissor(drawer.left_column_width + 1,
0, 0,
region->winx - drawer.left_column_width, region->winx - drawer.left_column_width,
@@ -248,7 +254,7 @@ static void draw_cell_contents(const bContext *C,
UI_block_end(C, cells_block); UI_block_end(C, cells_block);
UI_block_draw(C, cells_block); UI_block_draw(C, cells_block);
GPU_scissor_test(false); GPU_scissor(UNPACK4(old_scissor));
} }
static void update_view2d_tot_rect(const SpreadsheetDrawer &drawer, static void update_view2d_tot_rect(const SpreadsheetDrawer &drawer,