Changeset 83928 in webkit
- Timestamp:
- Apr 14, 2011 6:44:04 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r83917 r83928 1 2011-04-14 Keith Kyzivat <keith.kyzivat@nokia.com> 2 3 Reviewed by Laszlo Gombos. 4 5 [Qt] Add -maximize flag to QtTestBrowser and MiniBrowser 6 https://bugs.webkit.org/show_bug.cgi?id=58007 7 8 Adds flag to start the test browsers maximized. 9 Symbian started maximized on QtTestBrowser - made MiniBrowser follow 10 suit. 11 Also fixes some ToggleFullScreen issues so that prior window state is 12 restored. 13 14 * MiniBrowser/qt/BrowserWindow.cpp: 15 (BrowserWindow::BrowserWindow): 16 (BrowserWindow::toggleFullScreenMode): 17 * MiniBrowser/qt/MiniBrowserApplication.cpp: 18 (MiniBrowserApplication::handleUserOptions): 19 * MiniBrowser/qt/MiniBrowserApplication.h: 20 (WindowOptions::WindowOptions): 21 * QtTestBrowser/launcherwindow.cpp: 22 (LauncherWindow::init): 23 (LauncherWindow::toggleFullScreenMode): 24 * QtTestBrowser/launcherwindow.h: 25 (WindowOptions::WindowOptions): 26 * QtTestBrowser/main.cpp: 27 (LauncherApplication::handleUserOptions): 28 1 29 2011-04-14 Ojan Vafai <ojan@chromium.org> 2 30 -
trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp
r82922 r83928 142 142 } 143 143 144 resize(800, 600); 144 if (m_windowOptions.startMaximized) 145 setWindowState(windowState() | Qt::WindowMaximized); 146 else 147 resize(800, 600); 145 148 show(); 146 149 } … … 299 302 void BrowserWindow::toggleFullScreenMode(bool enable) 300 303 { 301 if (enable) 302 setWindowState(Qt::WindowFullScreen); 303 else 304 setWindowState(Qt::WindowNoState); 304 bool alreadyEnabled = windowState() & Qt::WindowFullScreen; 305 if (enable ^ alreadyEnabled) 306 setWindowState(windowState() ^ Qt::WindowFullScreen); 305 307 } 306 308 -
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
r82244 r83928 56 56 if (args.contains("-help")) { 57 57 qDebug() << "Usage:" << programName.toLatin1().data() 58 << "[-maximize]" 58 59 << "[-r list]" 59 60 << "[-robot-timeout seconds]" … … 65 66 appQuit(0); 66 67 } 68 69 if (args.contains("-maximize")) 70 m_windowOptions.startMaximized = true; 67 71 68 72 int robotIndex = args.indexOf("-r"); -
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h
r82244 r83928 38 38 , useSeparateWebProcessPerWindow(false) 39 39 , printLoadedUrls(false) 40 #if defined(Q_OS_SYMBIAN) 41 , startMaximized(true) 42 #else 43 , startMaximized(false) 44 #endif 40 45 { 41 46 } … … 44 49 bool useSeparateWebProcessPerWindow; 45 50 bool printLoadedUrls; 51 bool startMaximized; 46 52 }; 47 53 -
trunk/Tools/QtTestBrowser/launcherwindow.cpp
r82922 r83928 67 67 setCentralWidget(splitter); 68 68 69 #if defined(Q_OS_SYMBIAN) 70 setWindowState(Qt::WindowMaximized); 71 #else 72 setWindowState(Qt::WindowNoState); 73 resize(800, 600); 74 #endif 69 if (m_windowOptions.startMaximized) 70 setWindowState(windowState() | Qt::WindowMaximized); 71 else 72 resize(800, 600); 75 73 76 74 m_inspector = new WebInspector; … … 776 774 void LauncherWindow::toggleFullScreenMode(bool enable) 777 775 { 778 if (enable) 779 setWindowState(Qt::WindowFullScreen); 780 else { 781 #if defined(Q_OS_SYMBIAN) 782 setWindowState(Qt::WindowMaximized); 783 #else 784 setWindowState(Qt::WindowNoState); 785 #endif 786 } 776 bool alreadyEnabled = windowState() & Qt::WindowFullScreen; 777 if (enable ^ alreadyEnabled) 778 setWindowState(windowState() ^ Qt::WindowFullScreen); 787 779 } 788 780 -
trunk/Tools/QtTestBrowser/launcherwindow.h
r82919 r83928 105 105 #endif 106 106 , printLoadedUrls(false) 107 #if defined(Q_OS_SYMBIAN) 108 , startMaximized(true) 109 #else 110 , startMaximized(false) 111 #endif 107 112 { 108 113 } … … 130 135 QUrl inspectorUrl; 131 136 quint16 remoteInspectorPort; 137 bool startMaximized; 132 138 }; 133 139 -
trunk/Tools/QtTestBrowser/main.cpp
r82244 r83928 184 184 << QString("[-viewport-update-mode %1]").arg(formatKeys(updateModes)).toLatin1().data() 185 185 << "[-cache-webview]" 186 << "[-maximize]" 186 187 << "[-show-fps]" 187 188 << "[-r list]" … … 235 236 windowOptions.useLocalStorage = true; 236 237 238 if (args.contains("-maximize")) 239 windowOptions.startMaximized = true; 240 237 241 if (args.contains("-offline-storage-database-enabled")) 238 242 windowOptions.useOfflineStorageDatabase = true;
Note: See TracChangeset
for help on using the changeset viewer.