mirror of
				https://github.com/yuzu-emu/yuzu.git
				synced 2025-11-04 05:23:43 +00:00 
			
		
		
		
	citra-qt: Add helper function to get a monospace QFont
This commit is contained in:
		
							parent
							
								
									afd45d1d7f
								
							
						
					
					
						commit
						c7745408f7
					
				@ -18,6 +18,7 @@ set(SRCS
 | 
				
			|||||||
            debugger/ramview.cpp
 | 
					            debugger/ramview.cpp
 | 
				
			||||||
            debugger/registers.cpp
 | 
					            debugger/registers.cpp
 | 
				
			||||||
            util/spinbox.cpp
 | 
					            util/spinbox.cpp
 | 
				
			||||||
 | 
					            util/util.cpp
 | 
				
			||||||
            bootmanager.cpp
 | 
					            bootmanager.cpp
 | 
				
			||||||
            hotkeys.cpp
 | 
					            hotkeys.cpp
 | 
				
			||||||
            main.cpp
 | 
					            main.cpp
 | 
				
			||||||
@ -42,6 +43,7 @@ set(HEADERS
 | 
				
			|||||||
            debugger/ramview.h
 | 
					            debugger/ramview.h
 | 
				
			||||||
            debugger/registers.h
 | 
					            debugger/registers.h
 | 
				
			||||||
            util/spinbox.h
 | 
					            util/spinbox.h
 | 
				
			||||||
 | 
					            util/util.h
 | 
				
			||||||
            bootmanager.h
 | 
					            bootmanager.h
 | 
				
			||||||
            hotkeys.h
 | 
					            hotkeys.h
 | 
				
			||||||
            main.h
 | 
					            main.h
 | 
				
			||||||
 | 
				
			|||||||
@ -7,6 +7,8 @@
 | 
				
			|||||||
#include <QVBoxLayout>
 | 
					#include <QVBoxLayout>
 | 
				
			||||||
#include <QDebug>
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "citra_qt/util/util.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern GraphicsDebugger g_debugger;
 | 
					extern GraphicsDebugger g_debugger;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GPUCommandStreamItemModel::GPUCommandStreamItemModel(QObject* parent) : QAbstractListModel(parent), command_count(0)
 | 
					GPUCommandStreamItemModel::GPUCommandStreamItemModel(QObject* parent) : QAbstractListModel(parent), command_count(0)
 | 
				
			||||||
@ -79,7 +81,7 @@ GPUCommandStreamWidget::GPUCommandStreamWidget(QWidget* parent) : QDockWidget(tr
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    QListView* command_list = new QListView;
 | 
					    QListView* command_list = new QListView;
 | 
				
			||||||
    command_list->setModel(command_model);
 | 
					    command_list->setModel(command_model);
 | 
				
			||||||
    command_list->setFont(QFont("monospace"));
 | 
					    command_list->setFont(GetMonospaceFont());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    setWidget(command_list);
 | 
					    setWidget(command_list);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -14,6 +14,8 @@
 | 
				
			|||||||
#include <QSpinBox>
 | 
					#include <QSpinBox>
 | 
				
			||||||
#include <QComboBox>
 | 
					#include <QComboBox>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "citra_qt/util/util.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "common/vector_math.h"
 | 
					#include "common/vector_math.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "video_core/debug_utils/debug_utils.h"
 | 
					#include "video_core/debug_utils/debug_utils.h"
 | 
				
			||||||
@ -303,9 +305,7 @@ GPUCommandListWidget::GPUCommandListWidget(QWidget* parent) : QDockWidget(tr("Pi
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    list_widget = new QTreeView;
 | 
					    list_widget = new QTreeView;
 | 
				
			||||||
    list_widget->setModel(model);
 | 
					    list_widget->setModel(model);
 | 
				
			||||||
    QFont font("monospace");
 | 
					    list_widget->setFont(GetMonospaceFont());
 | 
				
			||||||
    font.setStyleHint(QFont::Monospace); // Automatic fallback to a monospace font on on platforms without a font called "monospace"
 | 
					 | 
				
			||||||
    list_widget->setFont(font);
 | 
					 | 
				
			||||||
    list_widget->setRootIsDecorated(false);
 | 
					    list_widget->setRootIsDecorated(false);
 | 
				
			||||||
    list_widget->setUniformRowHeights(true);
 | 
					    list_widget->setUniformRowHeights(true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -15,6 +15,8 @@
 | 
				
			|||||||
#include <QSpinBox>
 | 
					#include <QSpinBox>
 | 
				
			||||||
#include <QTreeView>
 | 
					#include <QTreeView>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "citra_qt/util/util.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "video_core/shader/shader.h"
 | 
					#include "video_core/shader/shader.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "graphics_vertex_shader.h"
 | 
					#include "graphics_vertex_shader.h"
 | 
				
			||||||
@ -245,7 +247,7 @@ QVariant GraphicsVertexShaderModel::data(const QModelIndex& index, int role) con
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    case Qt::FontRole:
 | 
					    case Qt::FontRole:
 | 
				
			||||||
        return QFont("monospace");
 | 
					        return GetMonospaceFont();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    case Qt::BackgroundRole:
 | 
					    case Qt::BackgroundRole:
 | 
				
			||||||
        // Highlight instructions which have no debug data associated to them
 | 
					        // Highlight instructions which have no debug data associated to them
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										13
									
								
								src/citra_qt/util/util.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								src/citra_qt/util/util.cpp
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,13 @@
 | 
				
			|||||||
 | 
					// Copyright 2015 Citra Emulator Project
 | 
				
			||||||
 | 
					// Licensed under GPLv2 or any later version
 | 
				
			||||||
 | 
					// Refer to the license.txt file included.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "util.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QFont GetMonospaceFont() {
 | 
				
			||||||
 | 
					    QFont font("monospace");
 | 
				
			||||||
 | 
					    // Automatic fallback to a monospace font on on platforms without a font called "monospace"
 | 
				
			||||||
 | 
					    font.setStyleHint(QFont::Monospace);
 | 
				
			||||||
 | 
					    font.setFixedPitch(true);
 | 
				
			||||||
 | 
					    return font;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										8
									
								
								src/citra_qt/util/util.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								src/citra_qt/util/util.h
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,8 @@
 | 
				
			|||||||
 | 
					// Copyright 2015 Citra Emulator Project
 | 
				
			||||||
 | 
					// Licensed under GPLv2 or any later version
 | 
				
			||||||
 | 
					// Refer to the license.txt file included.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QFont>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/// Returns a QFont object appropriate to use as a monospace font for debugging widgets, etc.
 | 
				
			||||||
 | 
					QFont GetMonospaceFont();
 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user