oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switched global to unique ptr and renamed olive namespace

Browse Source
This commit is contained in:
itsmattkc
2019-02-16 15:08:33 -08:00
parent 3d0a65c70d
commit e063a5ba8f
65 changed files with 860 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/viewerwidget.cpp
+5 -5
View File
@@ -426,11 +426,11 @@ void ViewerWidget::draw_title_safe_area() {
double viewportAr = (double) width() / (double) height();
double halfAr = viewportAr*0.5;
if (Olive::CurrentConfig.use_custom_title_safe_ratio && Olive::CurrentConfig.custom_title_safe_ratio > 0) {
if (Olive::CurrentConfig.custom_title_safe_ratio > viewportAr) {
halfHeight = (Olive::CurrentConfig.custom_title_safe_ratio/viewportAr)*0.5;
if (olive::CurrentConfig.use_custom_title_safe_ratio && olive::CurrentConfig.custom_title_safe_ratio > 0) {
if (olive::CurrentConfig.custom_title_safe_ratio > viewportAr) {
halfHeight = (olive::CurrentConfig.custom_title_safe_ratio/viewportAr)*0.5;
} else {
halfWidth = (viewportAr/Olive::CurrentConfig.custom_title_safe_ratio)*0.5;
halfWidth = (viewportAr/olive::CurrentConfig.custom_title_safe_ratio)*0.5;
}
}
@@ -609,7 +609,7 @@ void ViewerWidget::paintGL() {
glBindTexture(GL_TEXTURE_2D, 0);
// draw title/action safe area
if (Olive::CurrentConfig.show_title_safe_area) {
if (olive::CurrentConfig.show_title_safe_area) {
draw_title_safe_area();
}