From 32592364b8f43232fce583d9711a653e99953028 Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Sat, 15 Aug 2015 20:13:48 +0200 Subject: [PATCH] citra-qt/VertexShader: Minor UI improvements. Renamed "Iteration index" to the (hopefully) more intuitive "Cycle Index". Added flexible space at the bottom of the widget. --- .../debugger/graphics_vertex_shader.cpp | 17 +++++++++-------- src/citra_qt/debugger/graphics_vertex_shader.h | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp index 359193226..0c17edee0 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp @@ -308,14 +308,14 @@ GraphicsVertexShaderWidget::GraphicsVertexShaderWidget(std::shared_ptr< Pica::De instruction_description = new QLabel; - iteration_index = new QSpinBox; + cycle_index = new QSpinBox; connect(this, SIGNAL(SelectCommand(const QModelIndex&, QItemSelectionModel::SelectionFlags)), binary_list->selectionModel(), SLOT(select(const QModelIndex&, QItemSelectionModel::SelectionFlags))); connect(dump_shader, SIGNAL(clicked()), this, SLOT(DumpShader())); - connect(iteration_index, SIGNAL(valueChanged(int)), this, SLOT(OnIterationIndexChanged(int))); + connect(cycle_index, SIGNAL(valueChanged(int)), this, SLOT(OnCycleIndexChanged(int))); for (unsigned i = 0; i < ARRAY_SIZE(input_data); ++i) { connect(input_data[i], SIGNAL(textEdited(const QString&)), input_data_mapper, SLOT(map())); @@ -364,11 +364,12 @@ GraphicsVertexShaderWidget::GraphicsVertexShaderWidget(std::shared_ptr< Pica::De main_layout->addWidget(dump_shader); { auto sub_layout = new QHBoxLayout; - sub_layout->addWidget(new QLabel(tr("Iteration Index:"))); - sub_layout->addWidget(iteration_index); + sub_layout->addWidget(new QLabel(tr("Cycle Index:"))); + sub_layout->addWidget(cycle_index); main_layout->addLayout(sub_layout); } main_layout->addWidget(instruction_description); + main_layout->addStretch(); main_widget->setLayout(main_layout); setWidget(main_widget); @@ -437,9 +438,9 @@ void GraphicsVertexShaderWidget::Reload(bool replace_vertex_data, void* vertex_d input_data_container[source_attr]->setVisible(true); } - // Initialize debug info text for current iteration count - iteration_index->setMaximum(debug_data.records.size() - 1); - OnIterationIndexChanged(iteration_index->value()); + // Initialize debug info text for current cycle count + cycle_index->setMaximum(debug_data.records.size() - 1); + OnCycleIndexChanged(cycle_index->value()); model->endResetModel(); } @@ -453,7 +454,7 @@ void GraphicsVertexShaderWidget::OnInputAttributeChanged(int index) { Reload(); } -void GraphicsVertexShaderWidget::OnIterationIndexChanged(int index) { +void GraphicsVertexShaderWidget::OnCycleIndexChanged(int index) { QString text; auto& record = debug_data.records[index]; diff --git a/src/citra_qt/debugger/graphics_vertex_shader.h b/src/citra_qt/debugger/graphics_vertex_shader.h index 6e99f3674..1b3f1f7ec 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.h +++ b/src/citra_qt/debugger/graphics_vertex_shader.h @@ -51,7 +51,7 @@ private slots: void OnInputAttributeChanged(int index); - void OnIterationIndexChanged(int index); + void OnCycleIndexChanged(int index); void DumpShader(); @@ -80,7 +80,7 @@ private: // Text to be shown when input vertex data is not retrievable QLabel* breakpoint_warning; - QSpinBox* iteration_index; + QSpinBox* cycle_index; nihstro::ShaderInfo info; Pica::Shader::DebugData debug_data;