Changeset 83928 in webkit


Ignore:
Timestamp:
Apr 14, 2011 6:44:04 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-14 Keith Kyzivat <keith.kyzivat@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] Add -maximize flag to QtTestBrowser and MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=58007

Adds flag to start the test browsers maximized.
Symbian started maximized on QtTestBrowser - made MiniBrowser follow
suit.
Also fixes some ToggleFullScreen issues so that prior window state is
restored.

  • MiniBrowser/qt/BrowserWindow.cpp: (BrowserWindow::BrowserWindow): (BrowserWindow::toggleFullScreenMode):
  • MiniBrowser/qt/MiniBrowserApplication.cpp: (MiniBrowserApplication::handleUserOptions):
  • MiniBrowser/qt/MiniBrowserApplication.h: (WindowOptions::WindowOptions):
  • QtTestBrowser/launcherwindow.cpp: (LauncherWindow::init): (LauncherWindow::toggleFullScreenMode):
  • QtTestBrowser/launcherwindow.h: (WindowOptions::WindowOptions):
  • QtTestBrowser/main.cpp: (LauncherApplication::handleUserOptions):
Location:
trunk/Tools
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r83917 r83928  
     12011-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
    1292011-04-14  Ojan Vafai  <ojan@chromium.org>
    230
  • trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp

    r82922 r83928  
    142142    }
    143143
    144     resize(800, 600);
     144    if (m_windowOptions.startMaximized)
     145        setWindowState(windowState() | Qt::WindowMaximized);
     146    else
     147        resize(800, 600);
    145148    show();
    146149}
     
    299302void BrowserWindow::toggleFullScreenMode(bool enable)
    300303{
    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);
    305307}
    306308
  • trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp

    r82244 r83928  
    5656    if (args.contains("-help")) {
    5757        qDebug() << "Usage:" << programName.toLatin1().data()
     58             << "[-maximize]"
    5859             << "[-r list]"
    5960             << "[-robot-timeout seconds]"
     
    6566        appQuit(0);
    6667    }
     68
     69    if (args.contains("-maximize"))
     70        m_windowOptions.startMaximized = true;
    6771
    6872    int robotIndex = args.indexOf("-r");
  • trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h

    r82244 r83928  
    3838        , useSeparateWebProcessPerWindow(false)
    3939        , printLoadedUrls(false)
     40#if defined(Q_OS_SYMBIAN)
     41        , startMaximized(true)
     42#else
     43        , startMaximized(false)
     44#endif
    4045    {
    4146    }
     
    4449    bool useSeparateWebProcessPerWindow;
    4550    bool printLoadedUrls;
     51    bool startMaximized;
    4652};
    4753
  • trunk/Tools/QtTestBrowser/launcherwindow.cpp

    r82922 r83928  
    6767    setCentralWidget(splitter);
    6868
    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);
    7573
    7674    m_inspector = new WebInspector;
     
    776774void LauncherWindow::toggleFullScreenMode(bool enable)
    777775{
    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);
    787779}
    788780
  • trunk/Tools/QtTestBrowser/launcherwindow.h

    r82919 r83928  
    105105#endif
    106106        , printLoadedUrls(false)
     107#if defined(Q_OS_SYMBIAN)
     108        , startMaximized(true)
     109#else
     110        , startMaximized(false)
     111#endif
    107112    {
    108113    }
     
    130135    QUrl inspectorUrl;
    131136    quint16 remoteInspectorPort;
     137    bool startMaximized;
    132138};
    133139
  • trunk/Tools/QtTestBrowser/main.cpp

    r82244 r83928  
    184184             << QString("[-viewport-update-mode %1]").arg(formatKeys(updateModes)).toLatin1().data()
    185185             << "[-cache-webview]"
     186             << "[-maximize]"
    186187             << "[-show-fps]"
    187188             << "[-r list]"
     
    235236        windowOptions.useLocalStorage = true;
    236237       
     238    if (args.contains("-maximize"))
     239        windowOptions.startMaximized = true;
     240
    237241    if (args.contains("-offline-storage-database-enabled"))
    238242        windowOptions.useOfflineStorageDatabase = true;
Note: See TracChangeset for help on using the changeset viewer.