diff options
| author | 2015-08-15 20:13:48 +0200 | |
|---|---|---|
| committer | 2015-08-16 14:12:12 +0200 | |
| commit | 32592364b8f43232fce583d9711a653e99953028 (patch) | |
| tree | 4f67fb221da50ada7a62efc45788d16950ef16f6 /src | |
| parent | citra-qt: Fix comment style. (diff) | |
| download | yuzu-32592364b8f43232fce583d9711a653e99953028.tar.gz yuzu-32592364b8f43232fce583d9711a653e99953028.tar.xz yuzu-32592364b8f43232fce583d9711a653e99953028.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/debugger/graphics_vertex_shader.cpp | 17 | ||||
| -rw-r--r-- | 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 | |||
| 308 | 308 | ||
| 309 | instruction_description = new QLabel; | 309 | instruction_description = new QLabel; |
| 310 | 310 | ||
| 311 | iteration_index = new QSpinBox; | 311 | cycle_index = new QSpinBox; |
| 312 | 312 | ||
| 313 | connect(this, SIGNAL(SelectCommand(const QModelIndex&, QItemSelectionModel::SelectionFlags)), | 313 | connect(this, SIGNAL(SelectCommand(const QModelIndex&, QItemSelectionModel::SelectionFlags)), |
| 314 | binary_list->selectionModel(), SLOT(select(const QModelIndex&, QItemSelectionModel::SelectionFlags))); | 314 | binary_list->selectionModel(), SLOT(select(const QModelIndex&, QItemSelectionModel::SelectionFlags))); |
| 315 | 315 | ||
| 316 | connect(dump_shader, SIGNAL(clicked()), this, SLOT(DumpShader())); | 316 | connect(dump_shader, SIGNAL(clicked()), this, SLOT(DumpShader())); |
| 317 | 317 | ||
| 318 | connect(iteration_index, SIGNAL(valueChanged(int)), this, SLOT(OnIterationIndexChanged(int))); | 318 | connect(cycle_index, SIGNAL(valueChanged(int)), this, SLOT(OnCycleIndexChanged(int))); |
| 319 | 319 | ||
| 320 | for (unsigned i = 0; i < ARRAY_SIZE(input_data); ++i) { | 320 | for (unsigned i = 0; i < ARRAY_SIZE(input_data); ++i) { |
| 321 | connect(input_data[i], SIGNAL(textEdited(const QString&)), input_data_mapper, SLOT(map())); | 321 | connect(input_data[i], SIGNAL(textEdited(const QString&)), input_data_mapper, SLOT(map())); |
| @@ -364,11 +364,12 @@ GraphicsVertexShaderWidget::GraphicsVertexShaderWidget(std::shared_ptr< Pica::De | |||
| 364 | main_layout->addWidget(dump_shader); | 364 | main_layout->addWidget(dump_shader); |
| 365 | { | 365 | { |
| 366 | auto sub_layout = new QHBoxLayout; | 366 | auto sub_layout = new QHBoxLayout; |
| 367 | sub_layout->addWidget(new QLabel(tr("Iteration Index:"))); | 367 | sub_layout->addWidget(new QLabel(tr("Cycle Index:"))); |
| 368 | sub_layout->addWidget(iteration_index); | 368 | sub_layout->addWidget(cycle_index); |
| 369 | main_layout->addLayout(sub_layout); | 369 | main_layout->addLayout(sub_layout); |
| 370 | } | 370 | } |
| 371 | main_layout->addWidget(instruction_description); | 371 | main_layout->addWidget(instruction_description); |
| 372 | main_layout->addStretch(); | ||
| 372 | main_widget->setLayout(main_layout); | 373 | main_widget->setLayout(main_layout); |
| 373 | setWidget(main_widget); | 374 | setWidget(main_widget); |
| 374 | 375 | ||
| @@ -437,9 +438,9 @@ void GraphicsVertexShaderWidget::Reload(bool replace_vertex_data, void* vertex_d | |||
| 437 | input_data_container[source_attr]->setVisible(true); | 438 | input_data_container[source_attr]->setVisible(true); |
| 438 | } | 439 | } |
| 439 | 440 | ||
| 440 | // Initialize debug info text for current iteration count | 441 | // Initialize debug info text for current cycle count |
| 441 | iteration_index->setMaximum(debug_data.records.size() - 1); | 442 | cycle_index->setMaximum(debug_data.records.size() - 1); |
| 442 | OnIterationIndexChanged(iteration_index->value()); | 443 | OnCycleIndexChanged(cycle_index->value()); |
| 443 | 444 | ||
| 444 | model->endResetModel(); | 445 | model->endResetModel(); |
| 445 | } | 446 | } |
| @@ -453,7 +454,7 @@ void GraphicsVertexShaderWidget::OnInputAttributeChanged(int index) { | |||
| 453 | Reload(); | 454 | Reload(); |
| 454 | } | 455 | } |
| 455 | 456 | ||
| 456 | void GraphicsVertexShaderWidget::OnIterationIndexChanged(int index) { | 457 | void GraphicsVertexShaderWidget::OnCycleIndexChanged(int index) { |
| 457 | QString text; | 458 | QString text; |
| 458 | 459 | ||
| 459 | auto& record = debug_data.records[index]; | 460 | 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: | |||
| 51 | 51 | ||
| 52 | void OnInputAttributeChanged(int index); | 52 | void OnInputAttributeChanged(int index); |
| 53 | 53 | ||
| 54 | void OnIterationIndexChanged(int index); | 54 | void OnCycleIndexChanged(int index); |
| 55 | 55 | ||
| 56 | void DumpShader(); | 56 | void DumpShader(); |
| 57 | 57 | ||
| @@ -80,7 +80,7 @@ private: | |||
| 80 | // Text to be shown when input vertex data is not retrievable | 80 | // Text to be shown when input vertex data is not retrievable |
| 81 | QLabel* breakpoint_warning; | 81 | QLabel* breakpoint_warning; |
| 82 | 82 | ||
| 83 | QSpinBox* iteration_index; | 83 | QSpinBox* cycle_index; |
| 84 | 84 | ||
| 85 | nihstro::ShaderInfo info; | 85 | nihstro::ShaderInfo info; |
| 86 | Pica::Shader::DebugData<true> debug_data; | 86 | Pica::Shader::DebugData<true> debug_data; |