OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-06-30 08:33:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix 0,0 size transform bug when resizing sources

Browse source 
Fix a bug where if a source's width or height becomes 0 while you're
stretching the size of a source or modifying it from the transform
dialog, it would become permanently invisible

Closes obsproject/obs-studio#7962
This commit is contained in:
Jim 2023-05-19 15:46:45 -07:00
parent 38e5411490
commit fcfc2eb5fc
2 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
UI/window-basic-preview.cpp
View file

@ -1492,9 +1492,17 @@ void OBSBasicPreview::StretchItem(const vec2 &pos)
obs_source_t *source = obs_sceneitem_get_source(stretchItem);
uint32_t source_cx = obs_source_get_width(source);
uint32_t source_cy = obs_source_get_height(source);
/* if the source's internal size has been set to 0 for whatever reason
* while resizing, do not update transform, otherwise source will be
* stuck invisible until a complete transform reset */
if (!source_cx || !source_cy)
return;
vec2 baseSize;
vec2_set(&baseSize, float(obs_source_get_width(source)),
float(obs_source_get_height(source)));
vec2_set(&baseSize, float(source_cx), float(source_cy));
vec2 size;
vec2_set(&size, br.x - tl.x, br.y - tl.y);

26
UI/window-basic-transform.cpp
View file

@ -246,8 +246,10 @@ void OBSBasicTransform::RefreshControls()
obs_sceneitem_get_crop(item, &crop);
obs_source_t *source = obs_sceneitem_get_source(item);
float width = float(obs_source_get_width(source));
float height = float(obs_source_get_height(source));
uint32_t source_cx = obs_source_get_width(source);
uint32_t source_cy = obs_source_get_height(source);
float width = float(source_cx);
float height = float(source_cy);
int alignIndex = AlignToList(osi.alignment);
int boundsAlignIndex = AlignToList(osi.bounds_alignment);
@ -260,6 +262,10 @@ void OBSBasicTransform::RefreshControls()
ui->sizeY->setValue(osi.scale.y * height);
ui->align->setCurrentIndex(alignIndex);
bool valid_size = source_cx != 0 && source_cy != 0;
ui->sizeX->setEnabled(valid_size);
ui->sizeY->setEnabled(valid_size);
ui->boundsType->setCurrentIndex(int(osi.bounds_type));
ui->boundsAlign->setCurrentIndex(boundsAlignIndex);
ui->boundsWidth->setValue(osi.bounds.x);
@ -308,15 +314,23 @@ void OBSBasicTransform::OnControlChanged()
return;
obs_source_t *source = obs_sceneitem_get_source(item);
double width = double(obs_source_get_width(source));
double height = double(obs_source_get_height(source));
uint32_t source_cx = obs_source_get_width(source);
uint32_t source_cy = obs_source_get_height(source);
double width = double(source_cx);
double height = double(source_cy);
obs_transform_info oti;
obs_sceneitem_get_info(item, &oti);
/* do not scale a source if it has 0 width/height */
if (source_cx != 0 && source_cy != 0) {
oti.scale.x = float(ui->sizeX->value() / width);
oti.scale.y = float(ui->sizeY->value() / height);
}
oti.pos.x = float(ui->positionX->value());
oti.pos.y = float(ui->positionY->value());
oti.rot = float(ui->rotation->value());
oti.scale.x = float(ui->sizeX->value() / width);
oti.scale.y = float(ui->sizeY->value() / height);
oti.alignment = listToAlign[ui->align->currentIndex()];
oti.bounds_type = (obs_bounds_type)ui->boundsType->currentIndex();