Permalink
Browse files

-WIDTHxHEIGHT! creates a non-resizable window.

  • Loading branch information...
1 parent 0b30459 commit 34e413a5311834179d5c95193194c4a7a047c47e @acaudwell committed Jan 28, 2012
Showing with 13 additions and 12 deletions.
  1. +2 −1 ChangeLog
  2. +1 −1 README
  3. +1 −1 data/gource.1
  4. +1 −1 src/core
  5. +2 −2 src/gource_settings.cpp
  6. +6 −6 src/main.cpp
View
@@ -1,6 +1,7 @@
0.38:
* New high quality sprites.
- * Window resizing and fullscreen toggle (alt + enter).
+ * Fullscreen toggle with alt + enter.
+ * Window is now resizable. -WIDTHxHEIGHT! creates a non-resizable window.
* Lowered minimum zoom distance.
* Use AM_CPPFLAGS in Makefile.am to allow passing custom CPPFLAGS.
* Don't add files that match the path of a known directory.
View
2 README
@@ -43,7 +43,7 @@ options:
-WIDTHxHEIGHT, --viewport WIDTHxHEIGHT
Set the viewport size. If -f is also supplied, will attempt to set
- the video mode to this also.
+ the video mode to this also. Add ! to make the window non-resizable.
-f, --fullscreen
Fullscreen.
View
@@ -17,7 +17,7 @@ requires a OpenGL capable video card to run.
Help ('\fB-H\fR' for extended help).
.TP
\fB\-WIDTHxHEIGHT, \-\-viewport WIDTHxHEIGHT\fR
-Set the viewport size. If \-f is also supplied, will attempt to set the video mode to this also.
+Set the viewport size. If \-f is also supplied, will attempt to set the video mode to this also. Add ! to make the window non-resizable.
.TP
\fB\-f\fR
Fullscreen
Submodule core updated 2 files
+39 −22 settings.cpp
+5 −2 settings.h
View
@@ -358,7 +358,7 @@ void GourceSettings::setGourceDefaults() {
gStringHashSeed = 31;
log_level = LOG_LEVEL_ERROR;
-
+
//delete file filters
for(std::vector<Regex*>::iterator it = file_filters.begin(); it != file_filters.end(); it++) {
delete (*it);
@@ -813,7 +813,7 @@ void GourceSettings::importGourceSettings(ConfFile& conffile, ConfSection* gourc
int posx = 0;
int posy = 0;
- if(parseRectangle(logo_offset_str, &posx, &posy)) {
+ if(parseRectangle(logo_offset_str, posx, posy)) {
logo_offset = vec2(posx, posy);
} else {
conffile.invalidValueException(entry);
View
@@ -37,11 +37,11 @@ int main(int argc, char *argv[]) {
std::string file = *fit;
int file_length = file.size();
-
+
if( file.rfind(".conf") == (file_length-5) && file_length > 5
|| file.rfind(".cfg") == (file_length-4) && file_length > 4
|| file.rfind(".ini") == (file_length-4) && file_length > 4) {
-
+
bool is_conf=true;
try {
@@ -75,7 +75,7 @@ int main(int argc, char *argv[]) {
//set path
if(!files.empty()) {
std::string path = files[files.size()-1];
-
+
ConfSectionList* sectionlist = conf.getSections("gource");
if(sectionlist!=0) {
@@ -121,12 +121,12 @@ int main(int argc, char *argv[]) {
//enable vsync
display.enableVsync(gGourceSettings.vsync);
-
+
//allow resizing window if we are not recording
- if(gGourceSettings.output_ppm_filename.empty()) {
+ if(gGourceSettings.resizable && gGourceSettings.output_ppm_filename.empty()) {
display.enableResize(true);
}
-
+
try {
display.init("Gource", gGourceSettings.display_width, gGourceSettings.display_height, gGourceSettings.fullscreen);

0 comments on commit 34e413a

Please sign in to comment.