ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GTK: Add right-click menu.

This commit is contained in:
Brandon Wright 2019-03-22 16:51:48 -05:00
parent 83505d88c2
commit 54ba8798b5
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/src/gtk_s9xwindow.cpp
View File

@ -276,19 +276,32 @@ event_button_press (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
switch (event->button)
auto window = (Snes9xWindow *)user_data;
if (S9xIsMousePluggedIn())
{
switch (event->button)
{
case 1:
S9xReportButton (BINDING_MOUSE_BUTTON0, 1);
S9xReportButton(BINDING_MOUSE_BUTTON0, 1);
break;
case 2:
S9xReportButton (BINDING_MOUSE_BUTTON1, 1);
S9xReportButton(BINDING_MOUSE_BUTTON2, 1);
break;
case 3:
S9xReportButton (BINDING_MOUSE_BUTTON2, 1);
S9xReportButton(BINDING_MOUSE_BUTTON1, 1);
break;
}
}
else if (event->button == 3)
{
#if GTK_MAJOR_VERSION >= 3
gtk_menu_popup_at_pointer(GTK_MENU(window->get_widget("view_menu_menu")), NULL);
#else
gtk_menu_popup(GTK_MENU(window->get_widget("view_menu_menu")), NULL,
NULL, NULL, NULL, 3, event->time);
#endif
}
return false;
}
@ -761,7 +774,7 @@ void Snes9xWindow::setup_splash()
void
Snes9xWindow::expose ()
{
if (!(config->fullscreen) && !(maximized_state))
if (!(config->fullscreen) && !(maximized_state))
{
config->window_width = get_width();
config->window_height = get_height();

2
gtk/src/snes9x.ui
View File

@ -1660,7 +1660,7 @@
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="hide_ui">
<property name="label" translatable="yes">_Hide Menu</property>
<property name="label" translatable="yes">_Toggle Menubar</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>