From d7255a63d8c91f83ab0540fd30e9b29ea2db624f Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 26 Dec 2015 14:00:39 +0100 Subject: [PATCH] Changed: Minor changes --HG-- branch : develop --- code/nel/include/nel/gui/view_renderer.h | 2 +- code/nel/src/gui/group_container.cpp | 6 +-- code/nel/src/gui/group_table.cpp | 4 +- code/nel/src/gui/widget_manager.cpp | 42 +++++++++---------- .../src/interface_v3/interface_manager.cpp | 4 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/code/nel/include/nel/gui/view_renderer.h b/code/nel/include/nel/gui/view_renderer.h index fe5dad405..a54708b04 100644 --- a/code/nel/include/nel/gui/view_renderer.h +++ b/code/nel/include/nel/gui/view_renderer.h @@ -169,7 +169,7 @@ namespace NLGUI /* * getScreenSize : get the screen window size changed (at last checkNewScreenSize called) */ - void getScreenSize (uint32 &w, uint32 &h); + void getScreenSize(uint32 &w, uint32 &h); /* * get OOW / OOH diff --git a/code/nel/src/gui/group_container.cpp b/code/nel/src/gui/group_container.cpp index 5003654f9..818c71278 100644 --- a/code/nel/src/gui/group_container.cpp +++ b/code/nel/src/gui/group_container.cpp @@ -64,7 +64,7 @@ namespace NLGUI rVR.getClipWindow(x, y, w, h); uint32 sw, sh; rVR.getScreenSize(sw, sh); - rVR.setClipWindow(0, 0, (sint32) sw, (sint32) sh); + rVR.setClipWindow(0, 0, (sint32)sw, (sint32)sh); rVR.drawRotFlipBitmap (renderLayer, xreal, yreal, wreal, hreal, 0, false, rVR.getBlankTextureId(), color ); rVR.setClipWindow(x, y, w ,h); } @@ -350,7 +350,7 @@ namespace NLGUI { if (_ResizerPos & Hotspot_xR) { - clippedNewW = std::min((sint32) sw + _Parent->getW() - _Parent->getXReal(), clippedNewW); + clippedNewW = std::min((sint32)sw + _Parent->getW() - _Parent->getXReal(), clippedNewW); } else { @@ -365,7 +365,7 @@ namespace NLGUI } else { - clippedNewW = std::min((sint32) sw - _Parent->getXReal(), clippedNewW); + clippedNewW = std::min((sint32)sw - _Parent->getXReal(), clippedNewW); } } // diff --git a/code/nel/src/gui/group_table.cpp b/code/nel/src/gui/group_table.cpp index c762fb15d..8b5b94b90 100644 --- a/code/nel/src/gui/group_table.cpp +++ b/code/nel/src/gui/group_table.cpp @@ -764,7 +764,7 @@ namespace NLGUI } // Resize the array - if (column>=_Columns.size()) + if (column >= _Columns.size()) _Columns.resize(column+1); // Handle rowspan from previous row @@ -773,7 +773,7 @@ namespace NLGUI _Columns[column].RowSpan--; column++; // if previous row had less elements, then we missing columns - if (column>=_Columns.size()) + if (column >= _Columns.size()) _Columns.resize(column+1); } diff --git a/code/nel/src/gui/widget_manager.cpp b/code/nel/src/gui/widget_manager.cpp index cdbe3ec73..861866f77 100644 --- a/code/nel/src/gui/widget_manager.cpp +++ b/code/nel/src/gui/widget_manager.cpp @@ -1790,13 +1790,13 @@ namespace NLGUI for (uint nMasterGroup = 0; nMasterGroup < _MasterGroups.size(); nMasterGroup++) { CWidgetManager::SMasterGroup &rMG = _MasterGroups[nMasterGroup]; - if(!rMG.Group || rMG.Group->getId()!="ui:interface") + if (!rMG.Group || rMG.Group->getId() != "ui:interface") continue; // For all priorities, but the worldspace one for (uint8 nPriority = 0; nPriority < WIN_PRIORITY_MAX; nPriority++) { - if(nPriority==WIN_PRIORITY_WORLD_SPACE) + if (nPriority==WIN_PRIORITY_WORLD_SPACE) continue; // For All windows (only layer 0 group container) @@ -1972,7 +1972,7 @@ namespace NLGUI if(w!=0 && h!=0 && !CViewRenderer::getInstance()->isMinimized()) { updateAllLocalisedElements (); - setScreenWH( w, h ); + setScreenWH(w, h); } } @@ -2075,18 +2075,18 @@ namespace NLGUI } // Draw the pointer and DND Item - if( getPointer() != NULL) + if (getPointer() != NULL) { - if ( getPointer()->getActive()) + if (getPointer()->getActive()) getPointer()->draw (); } - if( CInterfaceElement::getEditorMode() ) + if (CInterfaceElement::getEditorMode()) { for( int i = 0; i < editorSelection.size(); i++ ) { - CInterfaceElement *e = getElementFromId( editorSelection[ i ] ); - if( e != NULL ) + CInterfaceElement *e = getElementFromId(editorSelection[i]); + if (e != NULL) e->drawHighlight(); } } @@ -3541,9 +3541,9 @@ namespace NLGUI // Resolve the widget names for( int i = 0; i < editorSelection.size(); i++ ) { - CInterfaceElement *e = getElementFromId( editorSelection[ i ] ); - if( e != NULL ) - elms.push_back( e ); + CInterfaceElement *e = getElementFromId(editorSelection[i]); + if (e != NULL) + elms.push_back(e); } editorSelection.clear(); @@ -3564,19 +3564,19 @@ namespace NLGUI // Reparent the widgets to the new group for( int i = 0; i < elms.size(); i++ ) { - CInterfaceElement *e = elms[ i ]; + CInterfaceElement *e = elms[i]; oldId = e->getId(); CInterfaceGroup *p = e->getParent(); - if( p != NULL ) - p->takeElement( e ); + if (p != NULL) + p->takeElement(e); - g->addElement( e ); - e->setParent( g ); - e->setParentPos( g ); - e->setParentSize( g ); - e->setIdRecurse( e->getShortId() ); + g->addElement(e); + e->setParent(g); + e->setParentPos(g); + e->setParentSize(g); + e->setIdRecurse(e->getShortId()); - onWidgetMoved( oldId, e->getId() ); + onWidgetMoved(oldId, e->getId()); } elms.clear(); @@ -3724,7 +3724,7 @@ namespace NLGUI _MouseOverWindow = false; inGame = false; - setScreenWH( 0, 0 ); + setScreenWH(0, 0); _GroupSelection = false; multiSelection = false; diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp index 2624aef77..44aeaa7d6 100644 --- a/code/ryzom/client/src/interface_v3/interface_manager.cpp +++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp @@ -495,8 +495,8 @@ CInterfaceManager::CInterfaceManager() CViewRenderer::getInstance()->checkNewScreenSize(); { uint32 w,h; - CViewRenderer::getInstance()->getScreenSize( w, h ); - CWidgetManager::getInstance()->setScreenWH( w, h ); + CViewRenderer::getInstance()->getScreenSize(w, h); + CWidgetManager::getInstance()->setScreenWH(w, h); } CViewRenderer::getInstance()->init();