quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update GtkAdjustment data access methods

Browse Source
This commit is contained in:
Garux 2020-05-20 01:17:01 +03:00
parent 12263f74d1
commit 065862627e
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/camera/dialogs.cpp
View File

@ -943,7 +943,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ){
}
// Add the event
GetCurrentCam()->GetCam()->addEvent( static_cast<idCameraEvent::eventType>( type ), str, (long)( g_pTimeLine->value ) );
GetCurrentCam()->GetCam()->addEvent( static_cast<idCameraEvent::eventType>( type ), str, (long)( gtk_adjustment_get_value( g_pTimeLine ) ) );
// Refresh event list
RefreshEventList();
@ -974,7 +974,7 @@ static gint ci_del( GtkWidget *widget, gpointer data ){
static gint ci_timeline_changed( GtkAdjustment *adjustment ){
char buf[128];
sprintf( buf, "%.2f", adjustment->value / 1000.f );
sprintf( buf, "%.2f", gtk_adjustment_get_value( adjustment ) / 1000.f );
gtk_label_set_text( g_pCurrentTime, buf );
// FIXME: this will never work completely perfect. Startcamera calls buildcamera, which sets all events to 'nottriggered'.
@ -986,7 +986,7 @@ static gint ci_timeline_changed( GtkAdjustment *adjustment ){
GetCurrentCam()->GetCam()->startCamera( 0 );
GetCurrentCam()->GetCam()->getCameraInfo( (long)( adjustment->value ), &origin[0], &dir[0], &fov );
GetCurrentCam()->GetCam()->getCameraInfo( (long)( gtk_adjustment_get_value( adjustment ) ), &origin[0], &dir[0], &fov );
VectorSet( angles, asin( dir[2] ) * 180 / 3.14159, atan2( dir[1], dir[0] ) * 180 / 3.14159, 0 );
g_CameraTable.m_pfnSetCamera( origin, angles );
}

12
contrib/gtkgensurf/gendlgs.cpp
View File

@ -803,7 +803,7 @@ static void general_wave( GtkToggleButton *widget, gpointer data ){
}
static void general_random( GtkAdjustment *adj, gpointer data ){
int nPos = (int)adj->value;
int nPos = (int)gtk_adjustment_get_value( adj );
if ( RandomSeed != nPos ) {
RandomSeed = nPos;
@ -831,7 +831,7 @@ static void extents_use_patches( GtkToggleButton *check, gpointer data ){
}
static void extents_nhnv_spin( GtkAdjustment *adj, int *data ){
int nPos = (int)adj->value;
int nPos = (int)gtk_adjustment_get_value( adj );
if ( *data != nPos ) {
if ( Game == QUAKE3 && UsePatches && ( nPos % 2 ) ) {
@ -851,7 +851,7 @@ static void extents_nhnv_spin( GtkAdjustment *adj, int *data ){
}
static void extents_decimate( GtkAdjustment *adj, gpointer data ){
int nPos = (int)adj->value;
int nPos = (int)gtk_adjustment_get_value( adj );
Decimate = nPos;
UpdatePreview( true );
@ -860,7 +860,7 @@ static void extents_decimate( GtkAdjustment *adj, gpointer data ){
// Hydra : snap to grid begin
/*static void extents_snaptogrid (GtkAdjustment *adj, gpointer data)
{
int nPos = (int)adj->value;
int nPos = (int)gtk_adjustment_get_value( adj );
SnapToGrid = nPos;
UpdatePreview (true);
@ -868,7 +868,7 @@ static void extents_decimate( GtkAdjustment *adj, gpointer data ){
// ^Fishman - Modified version of Hydra's snap to grid code.
static void extents_snaptogrid_spin( GtkAdjustment *adj, int *data ){
int nPos = (int)adj->value;
int nPos = (int)gtk_adjustment_get_value( adj );
SnapToGrid = nPos;
UpdatePreview( true );
}
@ -948,7 +948,7 @@ static gint fix_value_entryfocusout( GtkWidget* widget, GdkEventFocus *event, gp
}
static void fix_value_changed( GtkAdjustment *adj, gpointer data ){
int k, i = (int)adj->value;
int k, i = (int)gtk_adjustment_get_value( adj );
if ( xyz[Vertex[0].i][Vertex[0].j].fixed_value != i ) {
for ( k = 0; k < NumVerticesSelected; k++ )

2
contrib/gtkgensurf/view.cpp
View File

@ -358,7 +358,7 @@ static gint doublevariable_spinfocusout( GtkWidget* widget, GdkEventFocus* event
}
static void preview_spin( GtkAdjustment *adj, double *data ){
*data = DegreesToRadians( adj->value );
*data = DegreesToRadians( gtk_adjustment_get_value( adj ) );
UpdatePreview( false );
}

8
contrib/prtview/ConfigDialog.cpp
View File

@ -128,7 +128,7 @@ static void SetClipText( GtkWidget* label ){
}
static void OnScroll2d( GtkAdjustment *adj, gpointer data ){
portals.width_2d = static_cast<float>( adj->value );
portals.width_2d = static_cast<float>( gtk_adjustment_get_value( adj ) );
Set2DText( GTK_WIDGET( data ) );
Portals_shadersChanged();
@ -136,21 +136,21 @@ static void OnScroll2d( GtkAdjustment *adj, gpointer data ){
}
static void OnScroll3d( GtkAdjustment *adj, gpointer data ){
portals.width_3d = static_cast<float>( adj->value );
portals.width_3d = static_cast<float>( gtk_adjustment_get_value( adj ) );
Set3DText( GTK_WIDGET( data ) );
SceneChangeNotify();
}
static void OnScrollTrans( GtkAdjustment *adj, gpointer data ){
portals.trans_3d = static_cast<float>( adj->value );
portals.trans_3d = static_cast<float>( gtk_adjustment_get_value( adj ) );
Set3DTransText( GTK_WIDGET( data ) );
SceneChangeNotify();
}
static void OnScrollClip( GtkAdjustment *adj, gpointer data ){
portals.clip_range = static_cast<float>( adj->value );
portals.clip_range = static_cast<float>( gtk_adjustment_get_value( adj ) );
SetClipText( GTK_WIDGET( data ) );
SceneChangeNotify();

2
libs/gtkutil/cursor.h
View File

@ -269,7 +269,7 @@ void value_changed( gdouble value ){
}
}
static void adjustment_value_changed( GtkAdjustment *adjustment, DeferredAdjustment* self ){
self->value_changed( adjustment->value );
self->value_changed( gtk_adjustment_get_value( adjustment ) );
}
};

14
radiant/modelwindow.cpp
View File

@ -565,12 +565,12 @@ private:
void updateScroll() const {
GtkAdjustment *vadjustment = gtk_range_get_adjustment( GTK_RANGE( m_gl_scroll ) );
vadjustment->value = -m_originZ;
vadjustment->page_size = m_height;
vadjustment->page_increment = m_height / 2;
vadjustment->step_increment = 20;
vadjustment->lower = 0;
vadjustment->upper = totalHeight();
gtk_adjustment_set_value( vadjustment, -m_originZ );
gtk_adjustment_set_page_size( vadjustment, m_height );
gtk_adjustment_set_page_increment( vadjustment, m_height / 2 );
gtk_adjustment_set_step_increment( vadjustment, 20 );
gtk_adjustment_set_lower( vadjustment, 0 );
gtk_adjustment_set_upper( vadjustment, totalHeight() );
g_signal_emit_by_name( G_OBJECT( vadjustment ), "changed" );
}
@ -996,7 +996,7 @@ void ModelBrowser_scrollChanged( void* data, gdouble value ){
}
static void ModelBrowser_scrollbarScroll( GtkAdjustment *adjustment, ModelBrowser* modelBrowser ){
modelBrowser->m_scrollAdjustment.value_changed( adjustment->value );
modelBrowser->m_scrollAdjustment.value_changed( gtk_adjustment_get_value( adjustment ) );
}

14
radiant/patchdialog.cpp
View File

@ -462,14 +462,14 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){
td.scale[0] = td.scale[1] = 0;
td.shift[0] = td.shift[1] = 0;
if ( adj->value == 0 ) {
if ( gtk_adjustment_get_value( adj ) == 0 ) {
return;
}
if ( adj == g_object_get_data( G_OBJECT( g_PatchInspector.GetWidget() ), "hshift_adj" ) ) {
g_pi_globals.shift[0] = static_cast<float>( atof( gtk_entry_get_text( GTK_ENTRY( data ) ) ) );
if ( adj->value > 0 ) {
if ( gtk_adjustment_get_value( adj ) > 0 ) {
td.shift[0] = g_pi_globals.shift[0];
}
else{
@ -479,7 +479,7 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){
else if ( adj == g_object_get_data( G_OBJECT( g_PatchInspector.GetWidget() ), "vshift_adj" ) ) {
g_pi_globals.shift[1] = static_cast<float>( atof( gtk_entry_get_text( GTK_ENTRY( data ) ) ) );
if ( adj->value > 0 ) {
if ( gtk_adjustment_get_value( adj ) > 0 ) {
td.shift[1] = g_pi_globals.shift[1];
}
else{
@ -491,7 +491,7 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){
if ( g_pi_globals.scale[0] == 0.0f ) {
return;
}
if ( adj->value > 0 ) {
if ( gtk_adjustment_get_value( adj ) > 0 ) {
td.scale[0] = g_pi_globals.scale[0];
}
else{
@ -503,7 +503,7 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){
if ( g_pi_globals.scale[1] == 0.0f ) {
return;
}
if ( adj->value > 0 ) {
if ( gtk_adjustment_get_value( adj ) > 0 ) {
td.scale[1] = g_pi_globals.scale[1];
}
else{
@ -513,7 +513,7 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){
else if ( adj == g_object_get_data( G_OBJECT( g_PatchInspector.GetWidget() ), "rotate_adj" ) ) {
g_pi_globals.rotate = static_cast<float>( atof( gtk_entry_get_text( GTK_ENTRY( data ) ) ) );
if ( adj->value > 0 ) {
if ( gtk_adjustment_get_value( adj ) > 0 ) {
td.rotate = g_pi_globals.rotate;
}
else{
@ -521,7 +521,7 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){
}
}
adj->value = 0;
gtk_adjustment_set_value( adj, 0 );
// will scale shift rotate the patch accordingly

14
radiant/texwindow.cpp
View File

@ -1395,7 +1395,7 @@ void TextureBrowser_scrollChanged( void* data, gdouble value ){
}
static void TextureBrowser_verticalScroll( GtkAdjustment *adjustment, TextureBrowser* textureBrowser ){
textureBrowser->m_scrollAdjustment.value_changed( adjustment->value );
textureBrowser->m_scrollAdjustment.value_changed( gtk_adjustment_get_value( adjustment ) );
}
void TextureBrowser_updateScroll( TextureBrowser& textureBrowser ){
@ -1406,12 +1406,12 @@ void TextureBrowser_updateScroll( TextureBrowser& textureBrowser ){
GtkAdjustment *vadjustment = gtk_range_get_adjustment( GTK_RANGE( textureBrowser.m_texture_scroll ) );
vadjustment->value = -TextureBrowser_getOriginY( textureBrowser );
vadjustment->page_size = textureBrowser.height;
vadjustment->page_increment = textureBrowser.height / 2;
vadjustment->step_increment = 20;
vadjustment->lower = 0;
vadjustment->upper = totalHeight;
gtk_adjustment_set_value( vadjustment, -TextureBrowser_getOriginY( textureBrowser ) );
gtk_adjustment_set_page_size( vadjustment, textureBrowser.height );
gtk_adjustment_set_page_increment( vadjustment, textureBrowser.height / 2 );
gtk_adjustment_set_step_increment( vadjustment, 20 );
gtk_adjustment_set_lower( vadjustment, 0 );
gtk_adjustment_set_upper( vadjustment, totalHeight );
g_signal_emit_by_name( G_OBJECT( vadjustment ), "changed" );
}