← Back to branch summary

~brandontschaefer/nux/xim-tests

~brandontschaefer/nux/xim-tests

« back to all changes in this revision

Viewing changes to Nux/GridHLayout.cpp

Committer: Brandon Schaefer
Date: 2012-10-19 00:23:27 UTC
mfrom: (637.2.55 trunk)
Revision ID: brandon.schaefer@canonical.com-20121019002327-60e88jn3k8chi7gt

* Merged trunk

files added:
Nux/BasicView.cpp

Nux/BasicView.h

Nux/KineticScrollView.cpp

Nux/KineticScrollView.h

Nux/KineticScrolling

Nux/KineticScrolling/AxisDecelerationAnimation.cpp

Nux/KineticScrolling/AxisDecelerationAnimation.h

Nux/KineticScrolling/KineticAxisScroller.cpp

Nux/KineticScrolling/KineticAxisScroller.h

Nux/KineticScrolling/KineticScroller.cpp

Nux/KineticScrolling/KineticScroller.h

Nux/KineticScrolling/KineticScrollingEnums.h

Nux/KineticScrolling/KineticScrollingTickSource.cpp

Nux/KineticScrolling/KineticScrollingTickSource.h

Nux/KineticScrolling/VelocityCalculator.cpp

Nux/KineticScrolling/VelocityCalculator.h

Nux/NuxTimerTickSource.h

examples/TestButton.cpp

examples/TestButton.h

examples/kinetic_scroll_view.cpp

tests/gtest-nux-axisdecelerationanimation.cpp

tests/gtest-nux-globals.cpp

tests/gtest-nux-globals.h

tests/gtest-nux-input-area.cpp

tests/gtest-nux-kineticscroller.cpp

tests/gtest-nux-velocitycalculator.cpp

files modified:
.bzrignore

Nux/AbstractButton.cpp

Nux/AbstractCheckedButton.cpp

Nux/AbstractComboBox.cpp

Nux/AbstractComboBox.h

Nux/ActionItem.cpp

Nux/ActionItem.h

Nux/AnimatedTextureArea.cpp

Nux/AnimatedTextureArea.h

Nux/Area.cpp

Nux/Area.h

Nux/BaseWindow.cpp

Nux/BaseWindow.h

Nux/Button.cpp

Nux/Canvas.cpp

Nux/CheckBox.cpp

Nux/ClientArea.cpp

Nux/ClientArea.h

Nux/ColorEditor.cpp

Nux/ColorPickerDialog.cpp

Nux/ColorPreview.cpp

Nux/ColorPreview.h

Nux/ComboBoxSimple.cpp

Nux/ComboBoxSimple.h

Nux/Coverflow.cpp

Nux/Coverflow.h

Nux/CoverflowItem.h

Nux/DoubleValidator.cpp

Nux/DoubleValidator.h

Nux/EditTextBox.cpp

Nux/EditTextBox.h

Nux/FileSelector.cpp

Nux/FileSelector.h

Nux/FloatingWindow.cpp

Nux/FloatingWindow.h

Nux/GeisAdapter.cpp

Nux/GridHLayout.cpp

Nux/GridVLayout.cpp

Nux/GroupBox.cpp

Nux/GroupBox.h

Nux/GroupBox2.cpp

Nux/GroupBox2.h

Nux/HLayout.cpp

Nux/HLayout.h

Nux/HScrollBar.cpp

Nux/HScrollBar.h

Nux/HSplitter.cpp

Nux/HSplitter.h

Nux/HexRegExpValidator.cpp

Nux/HexRegExpValidator.h

Nux/InputArea.cpp

Nux/InputArea.h

Nux/InputMethodIBus.cpp

Nux/IntegerValidator.cpp

Nux/IntegerValidator.h

Nux/KeyboardHandler.cpp

Nux/KeyboardHandler.h

Nux/LayeredLayout.cpp

Nux/Layout.cpp

Nux/Layout.h

Nux/LinearLayout.cpp

Nux/MainLoopGLib.cpp

Nux/Makefile.am

Nux/MenuBar.cpp

Nux/MenuBar.h

Nux/MenuPage.cpp

Nux/MenuPage.h

Nux/MouseAreaCtrl.cpp

Nux/MouseAreaCtrl.h

Nux/NumericValuator.cpp

Nux/NumericValuator.h

Nux/Nux.cpp

Nux/Nux.h

Nux/PaintLayer.cpp

Nux/PaintLayer.h

Nux/Painter.cpp

Nux/Painter.h

Nux/Panel.cpp

Nux/PangoText.cpp

Nux/PangoText.h

Nux/ProgramFramework/ProgramTemplate.cpp

Nux/ProgramFramework/TestTextEntry.cpp

Nux/ProgramFramework/TestView.cpp

Nux/RGBValuator.cpp

Nux/RGBValuator.h

Nux/RadioButton.cpp

Nux/RangeValue.cpp

Nux/RangeValue.h

Nux/RangeValueInteger.cpp

Nux/RangeValueInteger.h

Nux/ScrollBar.h

Nux/ScrollView.cpp

Nux/ScrollView.h

Nux/SpinBox.cpp

Nux/SpinBox.h

Nux/SpinBoxDouble.cpp

Nux/SpinBoxDouble.h

Nux/SpinBox_Logic.cpp

Nux/SpinBox_Logic.h

Nux/StaticText.cpp

Nux/StaticTextBox.cpp

Nux/StaticTextBox.h

Nux/SystemThread.cpp

Nux/SystemThread.h

Nux/TabView.cpp

Nux/TabView.h

Nux/TextEntry.cpp

Nux/TextEntry.h

Nux/TextLoader.cpp

Nux/TextureArea.cpp

Nux/TextureArea.h

Nux/Theme.cpp

Nux/Theme.h

Nux/Timeline.cpp

Nux/ToolButton.cpp

Nux/ToolButton.h

Nux/VLayout.cpp

Nux/VLayout.h

Nux/VScrollBar.cpp

Nux/VScrollBar.h

Nux/VSplitter.cpp

Nux/VSplitter.h

Nux/Validator.cpp

Nux/Validator.h

Nux/View.cpp

Nux/View.h

Nux/WindowCompositor.cpp

Nux/WindowCompositor.h

Nux/WindowThread.cpp

Nux/WindowThread.h

NuxCore/Animation.cpp

NuxCore/AnimationController.cpp

NuxCore/AnimationController.h

NuxCore/Color.cpp

NuxCore/EasingCurve.cpp

NuxCore/EasingCurve.h

NuxCore/FileIO.cpp

NuxCore/FileIO.h

NuxCore/FileManager/NFileManagerGNU.cpp

NuxCore/FileManager/NFileManagerGNU.h

NuxCore/FileManager/NFileManagerGeneric.cpp

NuxCore/FileManager/NFileManagerGeneric.h

NuxCore/FileManager/NFileManagerWindows.cpp

NuxCore/FileManager/NFileManagerWindows.h

NuxCore/FileManager/NSerializer.cpp

NuxCore/FileManager/NSerializer.h

NuxCore/FileName.cpp

NuxCore/FileName.h

NuxCore/FilePath.cpp

NuxCore/FilePath.h

NuxCore/Logger.cpp

NuxCore/Makefile.am

NuxCore/Memory.cpp

NuxCore/NumberConversion.cpp

NuxCore/NumberConversion.h

NuxCore/NuxCore.cpp

NuxCore/NuxCore.h

NuxCore/Object.cpp

NuxCore/Object.h

NuxCore/ObjectPtr.h

NuxCore/OutputDevice.cpp

NuxCore/OutputDevice.h

NuxCore/Parsing.cpp

NuxCore/Parsing.h

NuxCore/Platform.cpp

NuxCore/Platform.h

NuxCore/Plugin/NPluginManager.cpp

NuxCore/Process.cpp

NuxCore/Process.h

NuxCore/Property-inl.h

NuxCore/PropertyTraits.h

NuxCore/TextString.cpp

NuxCore/TextString.h

NuxCore/ThreadGNU.cpp

NuxCore/ThreadGNU.h

NuxCore/ThreadWin.cpp

NuxCore/ThreadWin.h

NuxCore/TimeFunctions.cpp

NuxCore/TimeFunctions.h

NuxCore/Win32Dialogs/NWin32Clipboard.cpp

NuxCore/Win32Dialogs/NWin32Clipboard.h

NuxCore/Win32Dialogs/NWin32CustomDialog.cpp

NuxCore/Win32Dialogs/NWin32CustomDialog.h

NuxGraphics/CairoGraphics.cpp

NuxGraphics/Events.h

NuxGraphics/FontRenderer.cpp

NuxGraphics/FontRenderer.h

NuxGraphics/FontTexture.cpp

NuxGraphics/FontTexture.h

NuxGraphics/GLError.cpp

NuxGraphics/GLError.h

NuxGraphics/GLPBuffer.cpp

NuxGraphics/GLRenderStates.cpp

NuxGraphics/GLRenderStates.h

NuxGraphics/GLResource.cpp

NuxGraphics/GLResourceManager.h

NuxGraphics/GLSh_ColorPicker.cpp

NuxGraphics/GLSh_DrawFunction.cpp

NuxGraphics/GLSh_Fill.cpp

NuxGraphics/GLShaderParameter.h

NuxGraphics/GLTemplatePrimitiveBuffer.cpp

NuxGraphics/GLTextureResourceManager.cpp

NuxGraphics/GLTextureResourceManager.h

NuxGraphics/GLVertexResourceManager.cpp

NuxGraphics/GLVertexResourceManager.h

NuxGraphics/GLWindowManager.cpp

NuxGraphics/GLWindowManager.h

NuxGraphics/GpuDevice.cpp

NuxGraphics/GpuDevice.h

NuxGraphics/GpuDeviceShader.cpp

NuxGraphics/GpuDeviceTexture.cpp

NuxGraphics/GpuDeviceVertex.cpp

NuxGraphics/GraphicsDisplayWin.cpp

NuxGraphics/GraphicsDisplayWin.h

NuxGraphics/GraphicsDisplayX11.cpp

NuxGraphics/GraphicsDisplayX11.h

NuxGraphics/GraphicsEngine.cpp

NuxGraphics/GraphicsEngine.h

NuxGraphics/IOpenGLAnimatedTexture.h

NuxGraphics/IOpenGLAsmShader.cpp

NuxGraphics/IOpenGLAsmShader.h

NuxGraphics/IOpenGLBaseTexture.cpp

NuxGraphics/IOpenGLCgShader.h

NuxGraphics/IOpenGLCubeTexture.cpp

NuxGraphics/IOpenGLFrameBufferObject.cpp

NuxGraphics/IOpenGLFrameBufferObject.h

NuxGraphics/IOpenGLGLSLShader.cpp

NuxGraphics/IOpenGLGLSLShader.h

NuxGraphics/IOpenGLQuery.cpp

NuxGraphics/IOpenGLRectangleTexture.cpp

NuxGraphics/IOpenGLResource.h

NuxGraphics/IOpenGLSurface.cpp

NuxGraphics/IOpenGLTexture2D.cpp

NuxGraphics/IOpenGLVertexDeclaration.cpp

NuxGraphics/ImageSurface.cpp

NuxGraphics/ImageSurface.h

NuxGraphics/MeshData.cpp

NuxGraphics/NuxGraphics.h

NuxGraphics/NuxGraphicsResources.cpp

NuxGraphics/NuxGraphicsResources.h

NuxGraphics/RenderingPipe.cpp

NuxGraphics/RenderingPipeAsm.cpp

NuxGraphics/RenderingPipeGLSL.cpp

NuxGraphics/RenderingPipeTextureBlend.cpp

NuxGraphics/RenderingPipeTextureBlendShaderSource.h

NuxGraphics/XInputWindow.cpp

configure.ac

examples/Makefile.am

examples/coverflow.cpp

examples/gestures.cpp

examples/line-separator.cpp

examples/line-separator.h

examples/shortcut-keys.cpp

examples/text_entry_focus.cpp

gputests/arb_programs_limits.cpp

gputests/framebufferobject.cpp

gputests/quad_2texmod.cpp

gputests/texture_blur.cpp

gputests/texture_copy_blur.cpp

gputests/texture_data.cpp

gputests/texture_power_of_2.cpp

tests/Makefile.am

tests/geis_mock.cpp

tests/gtest-nux-area.cpp

tests/gtest-nux-cairo-wrapper.cpp

tests/gtest-nux-gesturebroker.cpp

tests/gtest-nux-scrollview.cpp

tests/gtest-nux-textentry.cpp

tests/gtest-nux-windowcompositor.cpp

tests/gtest-nuxcore-animation.cpp

tests/gtest-nuxcore-object.cpp

tests/nux_automated_test_framework.cpp

tests/test-scrollview.cpp

tests/test-timeline.cpp

tests/test_empty_window.cpp

tests/test_graphics_display.cpp

tests/xtest-button.cpp

tests/xtest-focus-on-mouse-down.cpp

tests/xtest-focus-on-mouse-enter.cpp

tests/xtest-hgrid-key-navigation.cpp

tests/xtest-hlayout-key-navigation.cpp

tests/xtest-keynav-directions.cpp

tests/xtest-mouse-buttons.cpp

tests/xtest-mouse-events.cpp

tests/xtest-scrollbar.cpp

tests/xtest-text-entry-compositionkeys.cpp

tests/xtest-text-entry-deadkeys.cpp

tests/xtest-text-entry-logic.cpp

tests/xtest-text-entry.cpp

tests/xtest-vlayout-key-navigation.cpp

Show diffs side-by-side

added added

removed removed

Nux/GridHLayout.cpp

579

579

graphics_engine.PopClippingRectangle();

580

580

graphics_engine.PopModelViewMatrix();

581

581

582

_queued_draw = false;

582

draw_cmd_queued_ = false;

583

583

}

584

584

585

585

Area* GridHLayout::KeyNavIterationRowOrder(KeyNavDirection direction)

Older »