Jacob Moen avatar Jacob Moen committed 4eb59a0 Merge

Merged default

Comments (0)

Files changed (3)

Ogitor/src/TerrainGroupEditorImportExport.cpp

 
     Ogre::NameValuePairList params;
     params["check1"] = "true";
+    params["input1"] = "Scale";
+    params["input2"] = "Offset";
 
     if(!mSystem->DisplayImportHeightMapDialog(params))
         return;

Ogitor/src/TerrainPageEditorImportExport.cpp

     {
         Ogre::NameValuePairList params;
         params["check1"] = "true";
+        params["input1"] = "Scale";
+        params["input2"] = "Offset";
+
         if(!mSystem->DisplayImportHeightMapDialog(params))
             return false;
 

qtOgitor/src/mainwindow.cpp

     mCameraViewModeBox->setMaxVisibleItems(15);
 
     mSnapMultiplierBox = new QComboBox();
-    mSnapMultiplierBox->setFixedSize(44,20);
+    mSnapMultiplierBox->setMaxVisibleItems(16);
+    
+    QString test_str("x99");
+
+    QFontMetrics fm(mSnapMultiplierBox->font());
+    int text_width = fm.width(test_str) + 28;
+    mSnapMultiplierBox->setFixedSize(text_width, 20 );
     for(unsigned int s = 1;s < 17;s++)
         mSnapMultiplierBox->addItem(QString("x") + QString("%1").arg(s));
     mSnapMultiplierBox->setCurrentIndex(0);
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.