blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix dragging panels changing region size 

While dragging panels, the region size would change which would feel glitchy.

See D7462 for a demo of the issue.
This commit is contained in:
Julian Eisel 2020-04-30 18:58:05 +02:00 committed by Julian Eisel
parent d44f323df5
commit 8e08d80e52
Notes: blender-bot 2023-02-14 08:28:46 +01:00 
Referenced by commit 86bdc959a3, Fix T82417: Panels draw below others while animating after drag
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/include/UI_interface.h
View File

@ -1672,6 +1672,7 @@ void UI_panel_end(const struct ScrArea *area,
void UI_panels_scale(struct ARegion *region, float new_width);
void UI_panel_label_offset(struct uiBlock *block, int *r_x, int *r_y);
int UI_panel_size_y(const struct Panel *panel);
bool UI_panel_is_dragging(const struct Panel *panel);
bool UI_panel_category_is_visible(const struct ARegion *region);
void UI_panel_category_add(struct ARegion *region, const char *name);

10
source/blender/editors/interface/interface_panel.c
View File

@ -876,6 +876,16 @@ static int get_panel_real_ofsx(Panel *panel)
}
}
bool UI_panel_is_dragging(const struct Panel *panel)
{
uiHandlePanelData *data = panel->activedata;
if (!data) {
return false;
}
return (data->state == PANEL_STATE_DRAG);
}
typedef struct PanelSort {
Panel *panel, *orig;
} PanelSort;

12
source/blender/editors/screen/area.c
View File

@ -2515,6 +2515,7 @@ void ED_region_panels_layout_ex(const bContext *C,
int margin_x = 0;
const bool region_layout_based = region->flag & RGN_FLAG_DYNAMIC_SIZE;
const bool is_context_new = (contextnr != -1) ? UI_view2d_tab_set(v2d, contextnr) : false;
bool update_tot_size = true;
/* before setting the view */
if (vertical) {
@ -2583,6 +2584,11 @@ void ED_region_panels_layout_ex(const bContext *C,
}
}
if (panel && UI_panel_is_dragging(panel)) {
/* Prevent View2d.tot rectangle size changes while dragging panels. */
update_tot_size = false;
}
ed_panel_draw(C, area, region, &region->panels, pt, panel, w, em, vertical);
}
@ -2638,8 +2644,10 @@ void ED_region_panels_layout_ex(const bContext *C,
y = -y;
}
/* this also changes the 'cur' */
UI_view2d_totRect_set(v2d, x, y);
if (update_tot_size) {
/* this also changes the 'cur' */
UI_view2d_totRect_set(v2d, x, y);
}
if (use_category_tabs) {
region->runtime.category = category;