Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.0 on 2022-01-18 at 14:00 UTC+1 (a few minutes of down time)

Commit 565f9514 authored by a1ex's avatar a1ex
Browse files

Ghost image is back in the menus

--HG--
branch : unified
parent 8e177a46137d
......@@ -354,6 +354,12 @@ LiveView overlays: histogram, zebras, cropmarks, spotmeter, focus peaking, false
{{clr}}
**Ghost image: OFF / Centered / Left / Right**
Shows a transparent overlay which can be created from any image in Play mode.
To select the image, go to Play mode and press the ``LiveView`` button.
.. _spotmeter:
**Spotmeter: OFF / Percent / IRE**
......
......@@ -483,14 +483,15 @@ static int handle_buttons(struct event * event)
livev_playback_reset();
}
if (event->type == 0 && event->param == BGMT_LV && (gui_state == GUISTATE_QR || PLAY_MODE))
// transparent overlay
extern int transparent_overlay;
if (transparent_overlay && event->type == 0 && event->param == BGMT_LV && (gui_state == GUISTATE_QR || PLAY_MODE))
{
schedule_transparent_overlay();
return 0;
}
// move transparent overlay
extern int transparent_overlay;
if (transparent_overlay && lv && gui_state == GUISTATE_IDLE && !gui_menu_shown())
{
if (event->type == 0 && event->param == BGMT_PRESS_UP)
......@@ -520,11 +521,6 @@ static int handle_buttons(struct event * event)
return 0;
}
}
if (event->type == 0 && event->param == BGMT_PLAY)
{
extern int transparent_overlay;
transparent_overlay = 0;
}
if (BGMT_FLASH_MOVIE)
{
......
......@@ -531,14 +531,15 @@ static int handle_buttons(struct event * event)
livev_playback_reset();
}
if (event->type == 0 && event->param == BGMT_LV && (gui_state == GUISTATE_QR || PLAY_MODE))
// transparent overlay
extern int transparent_overlay;
if (transparent_overlay && event->type == 0 && event->param == BGMT_LV && (gui_state == GUISTATE_QR || PLAY_MODE))
{
schedule_transparent_overlay();
return 0;
}
// move transparent overlay
extern int transparent_overlay;
if (transparent_overlay && lv && gui_state == GUISTATE_IDLE && !gui_menu_shown())
{
if (event->type == 0 && event->param == BGMT_PRESS_UP)
......@@ -568,11 +569,6 @@ static int handle_buttons(struct event * event)
return 0;
}
}
if (event->type == 0 && event->param == BGMT_PLAY)
{
extern int transparent_overlay;
transparent_overlay = 0;
}
return 1;
}
......
......@@ -2321,7 +2321,7 @@ disp_profiles_0_display(
);
}
/*
static void
transparent_overlay_display(
void * priv,
......@@ -2346,7 +2346,7 @@ transparent_overlay_display(
transparent_overlay ? "ON" : "OFF"
);
menu_draw_icon(x, y, MNI_BOOL_GDR(transparent_overlay), 0);
}*/
}
void transparent_overlay_offset(int dx, int dy)
{
......@@ -2480,14 +2480,14 @@ struct menu_entry zebra_menus[] = {
.select_reverse = crop_toggle_reverse,
.help = "Cropmarks for framing. Usually shown only in Movie mode."
},
/*{
{
.name = "Ghost image",
.priv = &transparent_overlay,
.display = transparent_overlay_display,
.select = menu_binary_toggle,
.select_auto = transparent_overlay_offset_clear,
.help = "Overlay any image in LiveView. In PLAY mode, press LV btn."
},*/
},
{
.name = "Spotmeter",
.priv = &spotmeter_draw,
......@@ -3611,5 +3611,5 @@ void transparent_overlay_from_play()
if (!lv) { force_liveview(); msleep(500); }
msleep(1000);
BMP_SEM( show_overlay(); )
transparent_overlay = 1;
//~ transparent_overlay = 1;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment