From 63f0d5cdad14fabec6d3dbd3f3e0a29d30348121 Mon Sep 17 00:00:00 2001 From: mfeemster Date: Sun, 13 Sep 2015 11:53:14 -0700 Subject: [PATCH] --Bug fixes: -Wraparound bug when generating random flames. -Make combo boxes have zero margins, they were getting clipped on Linux. --- Source/Ember/Ember.h | 4 ++-- Source/Fractorium/Main.cpp | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Ember/Ember.h b/Source/Ember/Ember.h index abb7238..6374ca5 100644 --- a/Source/Ember/Ember.h +++ b/Source/Ember/Ember.h @@ -1095,9 +1095,9 @@ public: if (rand.Rand() & 1) sym = symDistrib[rand.Rand() % Vlen(symDistrib)]; else if (rand.Rand() & 31) - sym = (rand.Rand() % 13) - 6; + sym = intmax_t(rand.Rand() % 13) - 6; else - sym = (rand.Rand() % 51) - 25; + sym = intmax_t(rand.Rand() % 51) - 25; } if (sym == 1 || sym == 0) diff --git a/Source/Fractorium/Main.cpp b/Source/Fractorium/Main.cpp index 806b586..8282cf4 100644 --- a/Source/Fractorium/Main.cpp +++ b/Source/Fractorium/Main.cpp @@ -41,7 +41,9 @@ int main(int argc, char *argv[]) " subcontrol-position: top left;" " padding: 0 3px 0 3px;" //" padding: 2px;" - "}" ); + "} \n" + "QComboBox { margin-top: 0px; padding-bottom: 0px; }" + ); #endif int rv = -1;