Commit 60034048 authored by Marjorie Hahn's avatar Marjorie Hahn
Browse files

Hard-coded the size of the icons in the toolbar to temporarily fix the shift... 

Hard-coded the size of the icons in the toolbar to temporarily fix the shift in size when switching between views until docked widgets are implemented. Fixes #5084.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7970 41f8697f-d340-4b68-9986-7bafba869bb8
parent 895559fe

isis/src/local/apps/ipce/IpceMainWindow.cpp

+9 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <QObject>

#include <QtWidgets>

#include <QSettings>

#include <QSize>

#include <QStatusBar>

#include <QTreeView>

#include <QVariant>
@@ -172,6 +173,12 @@ namespace Isis { 
    m_activeToolBar = new QToolBar(this);

    m_toolPad = new QToolBar(this);

    

    QSize iconSize(25, 45);



    m_permToolBar->setIconSize(iconSize);

    m_activeToolBar->setIconSize(iconSize);

    m_toolPad->setIconSize(iconSize);



    m_permToolBar->setObjectName("PermanentToolBar");

    m_activeToolBar->setObjectName("ActiveToolBar");

    m_toolPad->setObjectName("ToolPad");
@@ -394,6 +401,7 @@ namespace Isis { 
   * QActions, the Directory, and the active view.

   */

  void IpceMainWindow::updateToolBarActions() {

            

    m_permToolBar->clear();

    foreach ( QAction *action, m_directory->permToolBarActions() ) {

      m_permToolBar->addAction(action);

isis/src/local/apps/ipce/IpceMainWindow.h

+29 −26
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ namespace Isis { 
   *                           Fixes #5041

   *   @history 2017-07-26 Cole Neubauer - Changed the closevent funtion to check if a project is

   *                           and prompt user accordingly Fixes #4960

   *   @history 2017-08-09 Marjorie Hahn - Hard-coded the size of the icons in the toolbar to 

   *                           temporarily fix the shift in size when switching between views 

   *                           until docked widgets are implemented. Fixes #5084.

   */

  class IpceMainWindow : public QMainWindow {

      Q_OBJECT