Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 21, 2009, 1:18:36 PM (15 years ago)
Author:
rgrieder
Message:

Found some non empty new lines.

Location:
code/branches/presentation2/data/gui/scripts
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/data/gui/scripts/GUITools.lua

    r6363 r6387  
    1414function getMinTextSize(window)
    1515    local size = {}
    16    
     16
    1717    local lookAndFeel = CEGUI.WidgetLookManager:getSingleton():getWidgetLook(window:getLookNFeel())
    1818    local height = window:getFont():getLineSpacing() + window:getUnclippedPixelRect():getHeight() - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getHeight()
    1919    local width =  window:getFont():getTextExtent(window:getText()) + window:getUnclippedPixelRect():getWidth() - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getWidth()
    20    
     20
    2121    table.insert(size, height)
    2222    table.insert(size, width)
  • code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua

    r6266 r6387  
    8181        hideCursor()
    8282    end
    83    
     83
    8484    if find( activeSheets, filename ) ~= nil then
    8585        table.remove( activeSheets, find( activeSheets, filename ) )
     
    9696    bHidePrevious[filename]=hidePrevious
    9797    cursorVisibility[filename] = bCursorVisible
    98    
     98
    9999    if hidePrevious == true then
    100100        for i=1,nrOfActiveSheets-1 do
  • code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua

    r6369 r6387  
    7070    sampleWindow = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/SampleWindow")
    7171    sampleWindow:setText("SampleText")
    72    
     72
    7373    local size = getMinTextSize(sampleWindow)
    7474    lineHeight = size[1]
    75    
     75
    7676    commandWidth = 0
    7777    for k,v in pairs(commandList) do
     
    8686    size = getMinTextSize(sampleWindow)
    8787    addWidth = size[2]
    88    
     88
    8989    sampleWindow:setText("X")
    9090    size = getMinTextSize(sampleWindow)
     
    9292
    9393    spaceWidth = math.floor(1/14*commandWidth)
    94    
     94
    9595    buttonWidth = 145
    9696
     
    166166
    167167    line:setWidth(CEGUI.UDim(0, offset+clearWidth))
    168    
     168
    169169    return line
    170170end
     
    178178        window:addChildWindow(line)
    179179    end
    180    
     180
    181181    pane = tolua.cast(window, "CEGUI::ScrollablePane")
    182182    pane:setVerticalStepSize(getScrollingStepSize(window))
     
    216216    local commandNr = tonumber(match())
    217217    local buttonNr = tonumber(match())
    218  
     218
    219219    orxonox.KeyBinderManager:getInstance():unbind(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[commandNr], buttonNr))
    220220
  • code/branches/presentation2/data/gui/scripts/PickupInventory.lua

    r5781 r6387  
    2020    local equipCount = orxonox.PickupInventory:getEquipmentCount()
    2121    local usableCount = orxonox.PickupInventory:getUsableCount()
    22    
     22
    2323    if equipCount ~= self.lastEquipmentCount_ or usableCount ~= self.lastUsableCount_ then
    2424        self:updateTabs()
     
    3939    local t = name:sub(25, 27)
    4040    local i = name:sub(29)
    41    
     41
    4242    if t == "equ" then
    43        
     43
    4444    end
    45    
     45
    4646    if t == "use" then
    4747        if self.currentUsableID_ >= 0 then
     
    6060    orxonox.PickupInventory:getSingleton():clearInventory(winMgr, eqWin, usWin)
    6161    orxonox.PickupInventory:getSingleton():updateTabs(winMgr, eqWin, usWin)
    62    
     62
    6363    self.currentUsableID_ = orxonox.PickupInventory:getCurrentUsableIndex()
    6464    self.lastEquipmentCount_ = orxonox.PickupInventory:getEquipmentCount()
  • code/branches/presentation2/data/gui/scripts/QuestGUI.lua

    r5781 r6387  
    1515
    1616    local questManager = orxonox.QuestManager:getInstance()
    17      
     17
    1818    local questsList = winMgr:getWindow("orxonox/QuestGUI/QuestsList")
    1919
Note: See TracChangeset for help on using the changeset viewer.